CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-10 11:12:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

use logCmd

Browse Source
This commit is contained in:
m0duspwnens
2022-01-19 08:34:54 -05:00
parent f006d1a22c
commit 55a262646c
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
setup/so-functions
View File

@@ -2016,17 +2016,17 @@ proxy_validate() {
reserve_group_ids() { reserve_group_ids() {
# This is a hack to fix CentOS from taking group IDs that we need # This is a hack to fix CentOS from taking group IDs that we need
groupadd -g 928 kratos logCmd "groupadd -g 928 kratos"
groupadd -g 930 elasticsearch logCmd "groupadd -g 930 elasticsearch"
groupadd -g 931 logstash logCmd "groupadd -g 931 logstash"
groupadd -g 932 kibana logCmd "groupadd -g 932 kibana"
groupadd -g 933 elastalert logCmd "groupadd -g 933 elastalert"
groupadd -g 934 curator logCmd "groupadd -g 934 curator"
groupadd -g 937 zeek logCmd "groupadd -g 937 zeek"
groupadd -g 940 suricata logCmd "groupadd -g 940 suricata"
groupadd -g 941 stenographer logCmd "groupadd -g 941 stenographer"
groupadd -g 945 ossec logCmd "groupadd -g 945 ossec"
groupadd -g 946 cyberchef logCmd "groupadd -g 946 cyberchef"
} }
reserve_ports() { reserve_ports() {
@@ -2187,12 +2187,12 @@ saltify() {
fi fi
case "$install_type" in case "$install_type" in
'MANAGER' | 'EVAL' | 'MANAGERSEARCH' | 'FLEET' | 'HELIXSENSOR' | 'STANDALONE'| 'IMPORT') 'MANAGER' | 'EVAL' | 'MANAGERSEARCH' | 'FLEET' | 'HELIXSENSOR' | 'STANDALONE'| 'IMPORT')
reserve_group_ids >> "$setup_log" 2>&1 reserve_group_ids
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
logCmd "yum -y install sqlite curl mariadb-devel" logCmd "yum -y install sqlite curl mariadb-devel"
fi fi
# Download Ubuntu Keys in case manager updates = 1 # Download Ubuntu Keys in case manager updates = 1
mkdir -p /opt/so/gpg >> "$setup_log" 2>&1 logCmd "mkdir -vp /opt/so/gpg"
if [[ ! $is_airgap ]]; then if [[ ! $is_airgap ]]; then
logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/3004/SALTSTACK-GPG-KEY.pub" logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/3004/SALTSTACK-GPG-KEY.pub"
logCmd "wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg" logCmd "wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg"
@@ -2202,18 +2202,17 @@ saltify() {
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
logCmd "yum -y install salt-master-3004" logCmd "yum -y install salt-master-3004"
fi fi
systemctl enable salt-master >> "$setup_log" 2>&1 logCmd "systemctl enable salt-master"
;; ;;
*) *)
;; ;;
esac esac
if [[ ! $is_airgap ]]; then if [[ ! $is_airgap ]]; then
yum clean expire-cache >> "$setup_log" 2>&1 logCmd "yum clean expire-cache"
fi fi
set_progress_str 8 'Installing salt-minion & python modules' set_progress_str 8 'Installing salt-minion & python modules'
{
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
yum -y install salt-minion-3004\ logCmd "yum -y install salt-minion-3004\
httpd-tools\ httpd-tools\
python3\ python3\
python36-docker\ python36-docker\
@@ -2226,12 +2225,11 @@ saltify() {
device-mapper-persistent-data\ device-mapper-persistent-data\
lvm2\ lvm2\
openssl\ openssl\
jq; jq"
yum -y update --exclude=salt*; logCmd "yum -y update --exclude=salt*"
fi fi
systemctl enable salt-minion; logCmd "systemctl enable salt-minion"
} >> "$setup_log" 2>&1 logCmd "yum versionlock salt*"
yum versionlock salt*
else else
DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1 DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1