From 141fd49f02ec03a5639a6b2908c16d1ddbb81bd9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 13 Feb 2024 14:27:22 -0500 Subject: [PATCH] use rsync --- salt/common/soup_scripts.sls | 16 ++++++++++++---- salt/manager/tools/sbin/soup | 2 -- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index 86042a880..b4b3504d1 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -12,10 +12,18 @@ remove_common_so-firewall: {% set UPDATE_DIR='/tmp/sogh/securityonion'%} {% endif %} -copy_common: +copy_common_tools_sbin: cmd.run: - - name: "cp {{UPDATE_DIR}}/salt/common/tools/sbin/* /usr/sbin/." + - name: "rsync -avh {{UPDATE_DIR}}/salt/common/tools/sbin/* /opt/so/saltstack/default/salt/common/tools/sbin/" -copy_manager: +copy_manager_tools_sbin: cmd.run: - - name: "cp {{UPDATE_DIR}}/salt/manager/tools/sbin/* /usr/sbin/." + - name: "rsync -avh {{UPDATE_DIR}}/salt/manager/tools/sbin/* /opt/so/saltstack/default/salt/manager/tools/sbin/" + +copy_common_sbin: + cmd.run: + - name: "rsync -avh {{UPDATE_DIR}}/salt/common/tools/sbin/* /usr/sbin/" + +copy_manager_sbin: + cmd.run: + - name: "rsync -avh {{UPDATE_DIR}}/salt/manager/tools/sbin/* /usr/sbin/" diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index b3df3eb6f..c4eef3994 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -794,8 +794,6 @@ verify_latest_update_script() { echo "This version of the soup script is up to date. Proceeding." else echo "You are not running the latest soup version. Updating soup and its components. This might take multiple runs to complete." - \cp -v $UPDATE_DIR/salt/common/tools/sbin/* $DEFAULT_SALT_DIR/salt/common/tools/sbin/. - \cp -v $UPDATE_DIR/salt/manager/tools/sbin/* $DEFAULT_SALT_DIR/salt/manager/tools/sbin/. salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local