diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index 402ad9c4a..a4fafd6e3 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -6,19 +6,16 @@ remove_common_so-firewall: file.absent: - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall -# Sync some Utilities -soup_scripts: - file.recurse: - - name: /usr/sbin - - user: root - - group: root - - file_mode: 755 - - source: salt://common/tools/sbin +{% if pillar.global.airgap %} +{% set UPDATE_DIR='/tmp/soagupdate/securityonion'%} +{% else %} +{% set UPDATE_DIR='/tmp/sogh/securityonion'%} +{% endif %} -soup_manager_scripts: - file.recurse: - - name: /usr/sbin - - user: root - - group: root - - file_mode: 755 - - source: salt://manager/tools/sbin +copy_common: + cmd.run: + - name: "\cp " ~ {{ $UPDATE_DIR }} ~ "/salt/common/tools/sbin/* /usr/sbin/." + +copy_manager: + cmd.run: + - name: "\cp " ~ {{ $UPDATE_DIR }} ~ "/salt/manager/tools/sbin/* /usr/sbin/." diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 75be97928..2dfad1bbb 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -795,9 +795,9 @@ verify_latest_update_script() { else echo "You are not running the latest soup version. Updating soup and its components. This might take multiple runs to complete." cp $UPDATE_DIR/salt/common/tools/sbin/* $DEFAULT_SALT_DIR/salt/common/tools/sbin/. - #cp $UPDATE_DIR/salt/common/tools/sbin/* /usr/sbin/. + cp $UPDATE_DIR/salt/common/tools/sbin/* /usr/sbin/. cp $UPDATE_DIR/salt/manager/tools/sbin/* $DEFAULT_SALT_DIR/salt/manager/tools/sbin/. - #cp $UPDATE_DIR/salt/manager/tools/sbin/* /usr/sbin/. + cp $UPDATE_DIR/salt/manager/tools/sbin/* /usr/sbin/. #rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/soup #rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/so-firewall