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

Update Stuff Round 1

Browse Source
This commit is contained in:
Mike Reeves
2020-03-17 17:06:37 -04:00
parent 2e72816d2a
commit 73be1d0927
9 changed files with 265 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -17,6 +17,7 @@
SCRIPTDIR=$(dirname "$0")
source $SCRIPTDIR/so-whiptail
SOVERSION=1.2.1
accept_salt_key_local() {
echo "Accept the key locally on the master" >> $SETUPLOG 2>&1
@@ -460,7 +461,7 @@ docker_registry() {
}
docker_seed_registry() {
VERSION="HH1.1.4"
VERSION="HH$SOVERSION"
if [ $INSTALLTYPE != 'HELIXSENSOR' ]; then
TRUSTED_CONTAINERS=( \
"so-acng:$VERSION" \
@@ -743,7 +744,7 @@ master_static() {
touch /opt/so/saltstack/pillar/static.sls
echo "static:" > /opt/so/saltstack/pillar/static.sls
echo " soversion: HH1.1.4" >> /opt/so/saltstack/pillar/static.sls
echo " soversion: $SOVERSION" >> /opt/so/saltstack/pillar/static.sls
echo " hnmaster: $HNMASTER" >> /opt/so/saltstack/pillar/static.sls
echo " ntpserver: $NTPSERVER" >> /opt/so/saltstack/pillar/static.sls
echo " proxy: $PROXY" >> /opt/so/saltstack/pillar/static.sls
@@ -1412,6 +1413,11 @@ set_updates() {
fi
}
set_version() {
# Drop a file with the current version
echo "$SOVERSION" > /etc/soversion
}
update_sudoers() {
if ! grep -qE '^socore\ ALL=\(ALL\)\ NOPASSWD:(\/usr\/bin\/salt\-key|\/opt\/so\/saltstack)' /etc/sudoers; then

3
setup/so-setup
View File

@@ -159,6 +159,7 @@ if (whiptail_you_sure) ; then
calculate_useable_cores
whiptail_make_changes
set_hostname
set_version
clear_master
mkdir -p /nsm
get_filesystem_root
@@ -302,6 +303,7 @@ if (whiptail_you_sure) ; then
# Last Chance to back out
whiptail_make_changes
set_hostname
set_version
generate_passwords
auth_pillar
clear_master
@@ -570,6 +572,7 @@ if (whiptail_you_sure) ; then
fi
whiptail_make_changes
set_hostname
set_version
generate_passwords
auth_pillar
clear_master