diff --git a/salt/soctopus/files/SOCtopus.conf b/salt/soctopus/files/SOCtopus.conf index 74e2274a7..712e2609a 100644 --- a/salt/soctopus/files/SOCtopus.conf +++ b/salt/soctopus/files/SOCtopus.conf @@ -65,7 +65,7 @@ playbook_ext_url = https://{{MANAGER}}/playbook playbook_key = de6639318502476f2fa5aa06f43f51fb389a3d7f playbook_verifycert = no playbook_unit_test_index = playbook-testing -playbook_rulesets = windows +playbook_rulesets = {{ salt['pillar.get']('soctopus:playbook:rulesets')|join(",") }} [log] logfile = /var/log/SOCtopus/soctopus.log diff --git a/setup/so-functions b/setup/so-functions index f8c9d5822..255e054db 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1266,9 +1266,13 @@ manager_global() { " upload_queue_size: 4"\ " encoding: 'gzip'"\ " interval: 5"\ - "backup:"\ - " locations:"\ - " - /opt/so/saltstack/local" >> "$global_pillar" + "backup:"\ + " locations:"\ + " - /opt/so/saltstack/local"\ + "soctopus:"\ + " playbook:"\ + " rulesets:"\ + " - windows" >> "$global_pillar" printf '%s\n' '----' >> "$setup_log" 2>&1 }