diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 20738c7bd..651568ee9 100755 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -75,6 +75,8 @@ # $ MISPvars MISPvars () { debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null + # Some distros have no openssl installed by default, catch that exception. + $(openssl help 2> /dev/null) || (echo "No openssl, please install to continue"; exit -1) # Local non-root MISP user MISP_USER="${MISP_USER:-misp}" MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}" @@ -2237,8 +2239,9 @@ enableEPEL_REMI_8 () { ([[ ${DISTRI} == "centos8stream" ]] || [[ ${DISTRI} == "centos8" ]] || [[ ${DISTRI} == "rocky8.4" ]]) && sudo dnf config-manager --set-enabled powertools } -enableREMI_f33 () { - sudo dnf install http://rpms.remirepo.net/fedora/remi-release-33.rpm +enableREMI_fedora () { + [[ "${DISTRI%??}" == "fedora" ]] && sudo dnf install http://rpms.remirepo.net/fedora/remi-release-${DISTRI:6}.rpm -y + dnf list installed mod_lua && sudo dnf remove mod_lua -y sudo dnf install dnf-utils -y sudo dnf module enable php:remi-7.4 -y } @@ -2300,7 +2303,7 @@ yumInstallCoreDeps8 () { policycoreutils-python-utils \ langpacks-en glibc-all-langpacks \ libxslt-devel zlib-devel ssdeep-devel -y - sudo alternatives --set python /usr/bin/python3 + readlink -f /usr/bin/python | grep python3 || sudo alternatives --set python /usr/bin/python3 # Enable and start redis sudo systemctl enable --now redis.service @@ -2495,7 +2498,7 @@ installCoreRHEL8 () { cd $PATH_TO_MISP/app/files/scripts/python-cybox $SUDO_WWW git config core.filemode false # 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} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3' + ([[ ${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' UMASK=$(umask) @@ -2914,7 +2917,7 @@ mispmodulesRHEL () { [[ "${DIST_VER}" =~ ^[7].* ]] && sudo dnf install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y # some misp-modules dependencies for RHEL8 - ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y + ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DISTRI}" == "fedora34" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y sudo chmod 2777 /usr/local/src sudo chown root:users /usr/local/src @@ -3543,8 +3546,8 @@ installMISPRHEL () { apacheConfig_RHEL7 fi - if [[ "${DISTRI}" == "fedora33" ]]; then - enableREMI_f33 + if [[ "${DISTRI%??}" == "fedora" ]]; then + enableREMI_fedora yumInstallCoreDeps8 installEntropyRHEL installCoreRHEL8 diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index 2d4c8f003..943b5e195 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.4.0 on 2021-06-28 at 09:56.26 +; Generated by RHash v1.3.9 on 2021-07-02 at 13:54.25 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 162002 09:56.26 2021-06-28 INSTALL.sh -INSTALL.sh 3F884909B77C2EDF13B539BDAA911B7036BC451A 18E32C5259D87866E89E279672ADEE443FACD06CEEECBB3CD6A700B1630CDB7D E21B44E1CC6E20281BDE51F38B37850E234354C84BA452247A8D74038E806DE0E492A3B3D6B83592E77F84839ADF74A7 1CFFF3650C140D56B8E2342733A6625B29A02562E95A5205A8B8502E6BF4812CCAF8FC3519EDBCA343CC659D23D9C881E23E9C7AB5F140EED12DAFD5678B70D3 +; 162398 13:54.25 2021-07-02 INSTALL.sh +INSTALL.sh 7A77001F5A72A613D79CCB9D8DD52E4940A24624 1A4A66510D15575BF7D369E6CC0551F3421BDA2D7772E5A18DF53B7C87252425 5F495653054CF223A0283D8CB5E903A9422864F473FBEB45A3DFE2C95252E3171C809413318D31AB1CC34B4A5FD4D872 90D438EBF4237155D8647094D905410D7BB8F4B0A70EB444247E9C19D0C749553A28D1F5433A205A37F8CDBEBD7A9F815854CF3CD7B2980D676F37A4DB7776D2 diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index edce1c7b2..e7995345d 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -3f884909b77c2edf13b539bdaa911b7036bc451a INSTALL.sh +7a77001f5a72a613d79ccb9d8dd52e4940a24624 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index 167d1a5a8..66e9ddd29 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -18e32c5259d87866e89e279672adee443facd06ceeecbb3cd6a700b1630cdb7d INSTALL.sh +1a4a66510d15575bf7d369e6cc0551f3421bda2d7772e5a18df53b7c87252425 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index b3bd83e32..cbb9d4b38 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -e21b44e1cc6e20281bde51f38b37850e234354c84ba452247a8d74038e806de0e492a3b3d6b83592e77f84839adf74a7 INSTALL.sh +5f495653054cf223a0283d8cb5e903a9422864f473fbeb45a3dfe2c95252e3171c809413318d31ab1cc34b4a5fd4d872 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 486387aa3..00327a9a6 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -1cfff3650c140d56b8e2342733a6625b29a02562e95a5205a8b8502e6bf4812ccaf8fc3519edbca343cc659d23d9c881e23e9c7ab5f140eed12dafd5678b70d3 INSTALL.sh +90d438ebf4237155d8647094d905410d7bb8f4b0a70eb444247e9c19d0c749553a28d1f5433a205a37f8cdbebd7a9f815854cf3cd7b2980d676f37a4db7776d2 INSTALL.sh diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh index 3b1b4ebbf..8369623c8 100755 --- a/INSTALL/INSTALL.tpl.sh +++ b/INSTALL/INSTALL.tpl.sh @@ -711,8 +711,8 @@ installMISPRHEL () { apacheConfig_RHEL7 fi - if [[ "${DISTRI}" == "fedora33" ]]; then - enableREMI_f33 + if [[ "${DISTRI%??}" == "fedora" ]]; then + enableREMI_fedora yumInstallCoreDeps8 installEntropyRHEL installCoreRHEL8 diff --git a/app/files/warninglists b/app/files/warninglists index bc7ad438a..9ca0e0980 160000 --- a/app/files/warninglists +++ b/app/files/warninglists @@ -1 +1 @@ -Subproject commit bc7ad438a5c934657a584c5b4a77d3f1e5cf83a6 +Subproject commit 9ca0e098015bc27113f384a467257a8000f5a1c1 diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md index 4bf5a239c..e83d4f9fa 100644 --- a/docs/INSTALL.rhel8.md +++ b/docs/INSTALL.rhel8.md @@ -1,10 +1,10 @@ -# INSTALLATION INSTRUCTIONS for RHEL 8.x, CentOS8/Stream/Rocky8.4 +# INSTALLATION INSTRUCTIONS for RHEL 8.x based distros ------------------------- -### -2/ RHEL8/CentOS8/CentOS_Stream/Rocky8.4/Fedora33 - status +### -2/ RHEL8/CentOS8/CentOS_Stream/Rocky8.4/Fedora34 - status ------------------------- !!! notice - Tested fully working without SELinux by [@SteveClement](https://twitter.com/SteveClement) on 20210401 + Tested fully working without SELinux by [@SteveClement](https://twitter.com/SteveClement) on 20210702 TODO: Fix SELinux permissions, *pull-requests welcome*. {!generic/manual-install-notes.md!} @@ -93,14 +93,14 @@ sudo dnf install drpm -y ## 1.5.b/ Install vim (optional) ```bash # Because (neo)vim is just so practical -sudo dnf install neovim -y +sudo dnf install neovim -y || sudo dnf install vim -y || echo "neovim is not in the catalog" # For RHEL, it's vim and after enabling epel neovim is available too ``` ## 1.5.c/ Install ntpdate (optional) ```bash # In case you time is wrong, this will fix it. -sudo dnf install ntpdate -y +sudo dnf install ntpdate -y || sudo dnf install ntpsec -y sudo ntpdate pool.ntp.org ``` @@ -124,8 +124,9 @@ enableEPEL_REMI_8 () { ([[ ${DISTRI} == "centos8stream" ]] || [[ ${DISTRI} == "centos8" ]] || [[ ${DISTRI} == "rocky8.4" ]]) && sudo dnf config-manager --set-enabled powertools } -enableREMI_f33 () { - sudo dnf install http://rpms.remirepo.net/fedora/remi-release-33.rpm +enableREMI_fedora () { + [[ "${DISTRI%??}" == "fedora" ]] && sudo dnf install http://rpms.remirepo.net/fedora/remi-release-${DISTRI:6}.rpm -y + dnf list installed mod_lua && sudo dnf remove mod_lua -y sudo dnf install dnf-utils -y sudo dnf module enable php:remi-7.4 -y } @@ -160,7 +161,7 @@ yumInstallCoreDeps8 () { policycoreutils-python-utils \ langpacks-en glibc-all-langpacks \ libxslt-devel zlib-devel ssdeep-devel -y - sudo alternatives --set python /usr/bin/python3 + readlink -f /usr/bin/python | grep python3 || sudo alternatives --set python /usr/bin/python3 # Enable and start redis sudo systemctl enable --now redis.service @@ -272,7 +273,7 @@ installCoreRHEL8 () { cd $PATH_TO_MISP/app/files/scripts/python-cybox $SUDO_WWW git config core.filemode false # 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} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3' + ([[ ${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' UMASK=$(umask) diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md index 26b5707c6..bca8b71b7 100644 --- a/docs/generic/globalVariables.md +++ b/docs/generic/globalVariables.md @@ -17,6 +17,8 @@ MISPvars # $ MISPvars MISPvars () { debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null + # Some distros have no openssl installed by default, catch that exception. + $(openssl help 2> /dev/null) || (echo "No openssl, please install to continue"; exit -1) # Local non-root MISP user MISP_USER="${MISP_USER:-misp}" MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}" diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md index e43c344cf..b9c1c5814 100644 --- a/docs/generic/misp-modules-centos.md +++ b/docs/generic/misp-modules-centos.md @@ -7,7 +7,7 @@ mispmodulesRHEL () { [[ "${DIST_VER}" =~ ^[7].* ]] && sudo dnf install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y # some misp-modules dependencies for RHEL8 - ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y + ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DISTRI}" == "fedora34" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y sudo chmod 2777 /usr/local/src sudo chown root:users /usr/local/src