From 2a100c0dcc578369d10ad6dc1af0f1ce7eb7457a Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 2 Oct 2020 14:34:30 -0400 Subject: [PATCH] Add OLD_ prefix + only update rules if playbook enabled --- salt/playbook/files/OLD_playbook_db_init.sh | 2 +- setup/so-setup | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/salt/playbook/files/OLD_playbook_db_init.sh b/salt/playbook/files/OLD_playbook_db_init.sh index 1c92d635e..22428780c 100644 --- a/salt/playbook/files/OLD_playbook_db_init.sh +++ b/salt/playbook/files/OLD_playbook_db_init.sh @@ -4,5 +4,5 @@ default_salt_dir=/opt/so/saltstack/default -docker cp $default_salt_dir/salt/playbook/files/playbook_db_init-old.sql so-mysql:/tmp/playbook_db_init.sql +docker cp $default_salt_dir/salt/playbook/files/OLD_playbook_db_init.sql so-mysql:/tmp/playbook_db_init.sql docker exec so-mysql /bin/bash -c "/usr/bin/mysql -b -uroot -p{{MYSQLPASS}} < /tmp/playbook_db_init.sql" \ No newline at end of file diff --git a/setup/so-setup b/setup/so-setup index 400499bd9..c543a635a 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -658,8 +658,10 @@ fi set_progress_str 73 "$(print_salt_state_apply 'soctopus')" salt-call state.apply -l info soctopus >> $setup_log 2>&1 - set_progress_str 73 "Update playbook rules" - so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 & + if [[ "$PLAYBOOK" = 1 ]]; then + set_progress_str 73 "Update playbook rules" + so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 & + fi fi if [[ "$OSQUERY" = 1 ]]; then