Merge remote-tracking branch 'remotes/origin/dev' into soup-verify-salt

This commit is contained in:
m0duspwnens
2020-11-17 13:16:18 -05:00
2 changed files with 1 additions and 4 deletions

View File

@@ -98,7 +98,7 @@ airgap_update_dockers() {
update_registry() {
docker stop so-dockerregistry
docker rm so-dockerregistry
salt-call state.apply registry
salt-call state.apply registry queue=True
}
check_airgap() {

View File

@@ -604,9 +604,6 @@ fi
docker_seed_registry # ~ 60% when finished
set_progress_str 60 "$(print_salt_state_apply 'manager')"
if [[ "$STRELKARULES" == 1 ]]; then
/usr/sbin/so-yara-update >> $setup_log 2>&1
fi
salt-call state.apply -l info manager >> $setup_log 2>&1
set_progress_str 61 "$(print_salt_state_apply 'idstools')"