Merge pull request #7306 from SteveClement/tools

pull/7307/head
Steve Clement 2021-04-07 10:41:58 +09:00 committed by GitHub
commit f7830c4f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

View File

@ -102,6 +102,7 @@
## 0_RHEL7_SCL.sh ##
## 0_RHEL7_EPEL.sh ##
## 0_CentOS_EPEL.sh ##
## 0_EPEL_REMI.sh ##
## 0_yumInstallCoreDeps7.sh ##
## 0_yumInstallCoreDeps8.sh ##
## 0_yumInstallHaveged.sh ##
@ -708,20 +709,20 @@ installMISPRHEL () {
yumInstallCoreDeps8
installEntropyRHEL
installCoreRHEL8
installCake_RHEL8
installCake_RHEL
permissions_RHEL8
prepareDB_RHEL8
apacheConfig_RHEL8
prepareDB_RHEL
debug "Configuring Apache"
apacheConfig_RHEL
apacheConfig_RHEL8
fi
if [[ "${DIST_VER}" =~ ^[8].* ]]; then
enableEPEL_REMI_8
yumInstallCoreDeps8
installCoreRHEL8
installCake_RHEL8
installCake_RHEL
permissions_RHEL8
prepareDB_RHEL8
prepareDB_RHEL
apacheConfig_RHEL8
fi
@ -737,7 +738,7 @@ installMISPRHEL () {
debug "Preparing Database"
prepareDB_RHEL
debug "Configuring Apache"
apacheConfig_RHEL
apacheConfig_RHEL7
fi
debug "Enabling Haveged for additional entropy"
@ -745,7 +746,7 @@ installMISPRHEL () {
sudo systemctl enable --now haveged.service
debug "Setting File permissions"
permissions_RHEL
permissions_RHEL7
debug "Setting up firewall"
firewall_RHEL

View File

@ -144,6 +144,7 @@ yumInstallCoreDeps8 () {
python3-devel python3-pip python3-virtualenv \
python3-policycoreutils \
policycoreutils-python-utils \
langpacks-en glibc-all-langpacks \
libxslt-devel zlib-devel ssdeep-devel -y
sudo alternatives --set python /usr/bin/python3