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

more logCmd

Browse Source
This commit is contained in:
m0duspwnens
2022-01-19 13:38:10 -05:00
parent fbe54b9ee8
commit a861801a24
1 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
setup/so-functions
View File

@@ -799,7 +799,7 @@ configure_ntp() {
# Install chrony if it isn't already installed # Install chrony if it isn't already installed
if ! command -v chronyc &> /dev/null; then if ! command -v chronyc &> /dev/null; then
yum -y install chrony logCmd "yum -y install chrony"
fi fi
[[ -f $chrony_conf ]] && mv $chrony_conf "$chrony_conf.bak" [[ -f $chrony_conf ]] && mv $chrony_conf "$chrony_conf.bak"
@@ -1137,10 +1137,10 @@ installer_prereq_packages() {
if [ "$OS" == centos ]; then if [ "$OS" == centos ]; then
if [[ ! $is_iso ]]; then if [[ ! $is_iso ]]; then
if ! yum versionlock > /dev/null 2>&1; then if ! yum versionlock > /dev/null 2>&1; then
yum -y install yum-plugin-versionlock >> "$setup_log" 2>&1 logCmd "yum -y install yum-plugin-versionlock"
fi fi
if ! command -v nmcli > /dev/null 2>&1; then if ! command -v nmcli > /dev/null 2>&1; then
yum -y install NetworkManager >> "$setup_log" 2>&1 logCmd "yum -y install NetworkManager"
fi fi
fi fi
logCmd "systemctl enable NetworkManager" logCmd "systemctl enable NetworkManager"
@@ -1192,16 +1192,14 @@ disable_ipv6() {
docker_install() { docker_install() {
if [ $OS = 'centos' ]; then if [ $OS = 'centos' ]; then
{ logCmd "yum clean expire-cache"
yum clean expire-cache; if [[ ! $is_iso ]]; then
if [[ ! $is_iso ]]; then logCmd "yum -y install docker-ce-20.10.5-3.el7 docker-ce-cli-20.10.5-3.el7 docker-ce-rootless-extras-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7"
yum -y install docker-ce-20.10.5-3.el7 docker-ce-cli-20.10.5-3.el7 docker-ce-rootless-extras-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7 fi
fi logCmd "yum versionlock docker-ce-20.10.5-3.el7"
yum versionlock docker-ce-20.10.5-3.el7 logCmd "yum versionlock docker-ce-cli-20.10.5-3.el7"
yum versionlock docker-ce-cli-20.10.5-3.el7 logCmd "yum versionlock docker-ce-rootless-extras-20.10.5-3.el7"
yum versionlock docker-ce-rootless-extras-20.10.5-3.el7 logCmd "yum versionlock containerd.io-1.4.4-3.1.el7"
yum versionlock containerd.io-1.4.4-3.1.el7
} >> "$setup_log" 2>&1
else else
case "$install_type" in case "$install_type" in
@@ -2163,7 +2161,7 @@ remove_package() {
local package_name=$1 local package_name=$1
if [ $OS = 'centos' ]; then if [ $OS = 'centos' ]; then
if rpm -qa | grep -q "$package_name"; then if rpm -qa | grep -q "$package_name"; then
yum remove -y "$package_name" logCmd "yum remove -y $package_name"
fi fi
else else
if dpkg -l | grep -q "$package_name"; then if dpkg -l | grep -q "$package_name"; then
@@ -2214,21 +2212,8 @@ saltify() {
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
logCmd "yum -y install salt-minion-3004\ logCmd "yum -y install salt-minion-3004 httpd-tools python3 python36-docker python36-dateutil python36-m2crypto python36-mysql python36-packaging python36-lxml yum-utils device-mapper-persistent-data lvm2 openssl jq"
httpd-tools\ logCmd "yum -y update --exclude=salt*"
python3\
python36-docker\
python36-dateutil\
python36-m2crypto\
python36-mysql\
python36-packaging\
python36-lxml\
yum-utils\
device-mapper-persistent-data\
lvm2\
openssl\
jq"
logCmd "yum -y update --exclude=salt*"
fi fi
logCmd "systemctl enable salt-minion" logCmd "systemctl enable salt-minion"
logCmd "yum versionlock salt*" logCmd "yum versionlock salt*"
@@ -2769,8 +2754,8 @@ update_sudoers() {
update_packages() { update_packages() {
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
yum repolist >> /dev/null logCmd "yum repolist"
yum -y update --exclude=salt*,wazuh*,docker*,containerd* >> "$setup_log" logCmd "yum -y update --exclude=salt*,wazuh*,docker*,containerd*"
else else
retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1