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 branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev

Browse Source
This commit is contained in:
m0duspwnens
2020-05-07 11:39:12 -04:00
parent cdd985cc57 a883af32e7
commit c393cc6594
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -19,7 +19,7 @@ source ./so-whiptail
source ./so-variables source ./so-variables
source ./so-common-functions source ./so-common-functions
SOVERSION=1.2.2 SOVERSION=1.3.0
accept_salt_key_remote() { accept_salt_key_remote() {
systemctl restart salt-minion systemctl restart salt-minion
@@ -626,9 +626,9 @@ docker_registry() {
docker_seed_registry() { docker_seed_registry() {
local VERSION="HH$SOVERSION" local VERSION="HH$SOVERSION"
if ! [ -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then
local TRUSTED_CONTAINERS=(\ local TRUSTED_CONTAINERS=(\
"so-core:$VERSION" \ "so-nginx:$VERSION" \
"so-filebeat:$VERSION" \ "so-filebeat:$VERSION" \
"so-logstash:$VERSION" \ "so-logstash:$VERSION" \
"so-idstools:$VERSION" \ "so-idstools:$VERSION" \
@@ -686,8 +686,8 @@ docker_seed_registry() {
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
done done
else else
tar xvf /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 tar xvf /nsm/docker-registry/docker/registry.tar >> "$setup_log" 2>&1
rm /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 rm /nsm/docker-registry/docker/registry.tar >> "$setup_log" 2>&1
fi fi
} }