diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index 898de67ee..508b95b67 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -57,6 +57,12 @@ copy_so-yaml_manager_tools_sbin: - force: True - preserve: True +copy_so-repo-sync_manager_tools_sbin: + file.copy: + - name: /opt/so/saltstack/default/salt/manager/tools/sbin/so-repo-sync + - source: {{UPDATE_DIR}}/salt/manager/tools/sbin/so-repo-sync + - preserve: True + # This section is used to put the new script in place so that it can be called during soup. # It is faster than calling the states that normally manage them to put them in place. copy_so-common_sbin: @@ -94,6 +100,13 @@ copy_so-yaml_sbin: - force: True - preserve: True +copy_so-repo-sync_sbin: + file.copy: + - name: /usr/sbin/so-repo-sync + - source: {{UPDATE_DIR}}/salt/manager/tools/sbin/so-repo-sync + - force: True + - preserve: True + {% else %} fix_23_soup_sbin: cmd.run: diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 8d4d9f8ab..05c47a6c1 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -31,6 +31,11 @@ if ! echo "$PATH" | grep -q "/usr/sbin"; then export PATH="$PATH:/usr/sbin" fi +# See if a proxy is set. If so use it. +if [ -f /etc/profile.d/so-proxy.sh ]; then + . /etc/profile.d/so-proxy.sh +fi + # Define a banner to separate sections banner="=========================================================================" diff --git a/salt/manager/tools/sbin/so-elasticagent-status b/salt/manager/tools/sbin/so-elasticagent-status old mode 100644 new mode 100755 diff --git a/salt/manager/tools/sbin/so-repo-sync b/salt/manager/tools/sbin/so-repo-sync old mode 100644 new mode 100755