Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1

This commit is contained in:
m0duspwnens
2021-04-05 14:36:21 -04:00
10 changed files with 246 additions and 83 deletions

View File

@@ -1454,8 +1454,6 @@ install_cleanup() {
info "Removing so-setup permission entry from sudoers file"
sed -i '/so-setup/d' /etc/sudoers
fi
so-ssh-harden -q
}
import_registry_docker() {
@@ -2277,9 +2275,9 @@ securityonion_repo() {
mv /etc/yum.repos.d/* /root/oldrepos/
rm -f /etc/yum.repos.d/*
if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then
cp -f ./yum_repos/securityonioncache.repo /etc/yum.repos.d/
cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/
else
cp -f ./yum_repos/securityonion.repo /etc/yum.repos.d/
cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/
fi
else
echo "This is Ubuntu"