chg: [installer] Latest installer to reflect doc changes.

pull/8065/head
Steve Clement 2021-12-25 12:39:06 +09:00
parent f0f5d0ae80
commit 8e80d1f110
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
7 changed files with 19 additions and 14 deletions

View File

@ -1521,7 +1521,7 @@ configMISP () {
}
# Core cake commands to tweak MISP and aleviate some of the configuration pains
# The ${RUN_PHP} is ONLY set on RHEL/CentOS installs and can thus be ignored
# The ${RUN_PHP} is ONLY set on RHEL installs and can thus be ignored
# This file is NOT an excuse to NOT read the settings and familiarize ourselves with them ;)
coreCAKE () {
@ -2235,7 +2235,7 @@ enableEPEL_REMI_8 () {
sudo dnf install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
sudo dnf install dnf-utils -y
sudo dnf module enable php:remi-7.4 -y
([[ ${DISTRI} == "centos8stream" ]] || [[ ${DISTRI} == "centos8" ]] || [[ ${DISTRI} == "rocky8.4" ]]) && sudo dnf config-manager --set-enabled powertools
([[ ${DISTRI} == "centos8stream" ]] || [[ ${DISTRI} == "centos8" ]] || [[ ${DISTRI} == "rocky8.4" ]] || [[ ${DISTRI} == "rocky8.5" ]]) && sudo dnf config-manager --set-enabled powertools
}
enableREMI_fedora () {
@ -2464,13 +2464,14 @@ installCoreRHEL8 () {
# Create a python3 virtualenv
[[ -e $(which virtualenv-3 2>/dev/null) ]] && $SUDO_WWW virtualenv-3 -p python3 $PATH_TO_MISP/venv
[[ -e $(which virtualenv 2>/dev/null) ]] && $SUDO_WWW virtualenv -p python3 $PATH_TO_MISP/venv
[[ ! -e ${PATH_TO_MISP}/venv ]] && ${SUDO_WWW} python -m venv ${PATH_TO_MISP}/venv
sudo mkdir /usr/share/httpd/.cache
sudo chown $WWW_USER:$WWW_USER /usr/share/httpd/.cache
$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U pip setuptools
# If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'fedora34' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
([[ ${DISTRI} == 'centos8stream' ]] || [[ ${DISTRI} == 'centos8' ]] || [[ ${DISTRI} == 'rocky8.4' ]]) && sudo dnf install cmake -y && CMAKE_BIN='cmake'
([[ ${DISTRI} == 'centos8stream' ]] || [[ ${DISTRI} == 'centos8' ]] || [[ ${DISTRI} == 'rocky8.4' ]] || [[ ${DISTRI} == 'rocky8.5' ]]) && sudo dnf install cmake -y && CMAKE_BIN='cmake'
UMASK=$(umask)
umask 0022
@ -2494,7 +2495,7 @@ installCoreRHEL8 () {
$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U .
# FIXME: Remove libfaup etc once the egg has the library baked-in
# BROKEN: This needs to be tested on RHEL/CentOS
# BROKEN: This needs to be tested on RHEL/Rocky
sudo dnf install libcaca-devel -y
cd /tmp
[[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
@ -2890,7 +2891,7 @@ mispmodulesRHEL () {
# some misp-modules dependencies for RHEL<8
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
# some misp-modules dependencies for RHEL8
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/8/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/8/main/x86_64/endpoint-repo.noarch.rpm -y && sudo dnf install zbar-devel opencv-devel -y
echo "[Unit]
Description=MISP modules
@ -2959,7 +2960,7 @@ generateInstaller () {
done
# Pull out code snippets from generic Install Documents
for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-dashboard-centos.md misp-dashboard-cake.md misp-modules-debian.md misp-modules-centos.md misp-modules-cake.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md`; do
for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-dashboard-rhel.md misp-dashboard-cake.md misp-modules-debian.md misp-modules-rhel.md misp-modules-cake.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md`; do
xsnippet . ../../docs/generic/${f}
done
@ -3643,6 +3644,8 @@ x86_64-rhel-7
x86_64-centos-8
x86_64-rhel-8
x86_64-fedora-33
x86_64-fedora-34
x86_64-fedora-35
x86_64-debian-stretch
x86_64-debian-buster
x86_64-ubuntu-bionic

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.4.2 on 2021-12-18 at 01:30.15
; Generated by RHash v1.3.9 on 2021-12-25 at 12:36.06
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 160585 01:30.15 2021-12-18 INSTALL.sh
INSTALL.sh 18DA41F22A86C34CA135D6F7FF69B44B23D5B475 77534A9D7755C4DD60EA7F2C9656BD768F0AD209E715C6A45DE6CB20D944A632 81D2D58F49994D1ADC266465E58B50C65F04F655D8A2DB26DA9FCB6A0150C087BB4AED121E92472A6C6443979EFFEE4E B9CF4D11AA70D13B7542D9CE63E8B2DC5A3AEB3F652B873516749442195772F665ADC167831525E38911F6668A075A7136DF3DCDAD5123E75C5FFA03F1366950
; 160760 12:36.06 2021-12-25 INSTALL.sh
INSTALL.sh 544D6E91F39C5E461935089087307B0BEE1BFE23 7D6A5684431EBD0E0BCA3302D56506D7B45F00B1B11C1774A8734E998122BDF7 10654088BEF89BA11B45C072F66897E1D522287F20D564263C2A7380A576C65996FF204621ECCBB233EB36BAA16E9DCA 9F3EDA3873A7C711258DF4BD938934149F61702082B41AA4F570060820361F812A5A4C0F4C8C80DEFE84C0609A1C376DEC5BC02A691CD2662486EDBDEFB5443E

View File

@ -1 +1 @@
18da41f22a86c34ca135d6f7ff69b44b23d5b475 INSTALL.sh
544d6e91f39c5e461935089087307b0bee1bfe23 INSTALL.sh

View File

@ -1 +1 @@
77534a9d7755c4dd60ea7f2c9656bd768f0ad209e715c6a45de6cb20d944a632 INSTALL.sh
7d6a5684431ebd0e0bca3302d56506d7b45f00b1b11c1774a8734e998122bdf7 INSTALL.sh

View File

@ -1 +1 @@
81d2d58f49994d1adc266465e58b50c65f04f655d8a2db26da9fcb6a0150c087bb4aed121e92472a6c6443979effee4e INSTALL.sh
10654088bef89ba11b45c072f66897e1d522287f20d564263c2a7380a576c65996ff204621eccbb233eb36baa16e9dca INSTALL.sh

View File

@ -1 +1 @@
b9cf4d11aa70d13b7542d9ce63e8b2dc5a3aeb3f652b873516749442195772f665adc167831525e38911f6668a075a7136df3dcdad5123e75c5ffa03f1366950 INSTALL.sh
9f3eda3873a7c711258df4bd938934149f61702082b41aa4f570060820361f812a5a4c0f4c8c80defe84c0609a1c376dec5bc02a691cd2662486edbdefb5443e INSTALL.sh

View File

@ -165,7 +165,7 @@ generateInstaller () {
done
# Pull out code snippets from generic Install Documents
for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-dashboard-centos.md misp-dashboard-cake.md misp-modules-debian.md misp-modules-centos.md misp-modules-cake.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md`; do
for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-dashboard-rhel.md misp-dashboard-cake.md misp-modules-debian.md misp-modules-rhel.md misp-modules-cake.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md`; do
xsnippet . ../../docs/generic/${f}
done
@ -849,6 +849,8 @@ x86_64-rhel-7
x86_64-centos-8
x86_64-rhel-8
x86_64-fedora-33
x86_64-fedora-34
x86_64-fedora-35
x86_64-debian-stretch
x86_64-debian-buster
x86_64-ubuntu-bionic