CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
m0duspwnens
2020-11-17 13:16:18 -05:00
parent 4cd1086efa 2184c3b8ee
commit 4f4f64a47d
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/tools/sbin/soup
View File

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

3
setup/so-setup
View File

@@ -604,9 +604,6 @@ fi
docker_seed_registry # ~ 60% when finished docker_seed_registry # ~ 60% when finished
set_progress_str 60 "$(print_salt_state_apply 'manager')" 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 salt-call state.apply -l info manager >> $setup_log 2>&1
set_progress_str 61 "$(print_salt_state_apply 'idstools')" set_progress_str 61 "$(print_salt_state_apply 'idstools')"