copy with cp

This commit is contained in:
m0duspwnens
2024-02-13 12:48:31 -05:00
parent b713771494
commit 5c9b1ab38b
2 changed files with 14 additions and 17 deletions

View File

@@ -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/."

View File

@@ -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