From 0ea8c349fbf12dfc2bfaa77b2decc3e69ef9a381 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 28 Apr 2020 13:34:36 -0400 Subject: [PATCH] [fix] Fix typo + permissions --- setup/so-functions | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 051d2c39e..83f877bc2 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -588,7 +588,7 @@ docker_registry() { docker_seed_registry() { local VERSION="HH$so_version" - if [ ! -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then + if ! [ -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then local TRUSTED_CONTAINERS=(\ "so-core:$VERSION" \ "so-filebeat:$VERSION" \ @@ -644,7 +644,7 @@ docker_seed_registry() { } >> "$setup_log" 2>&1 done else - tar xvf /nsm/docker-registry/dockerso-dockers-$VERSION.tar >> "$setup_log" 2>&1 + tar xvf /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 rm /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 fi @@ -1247,6 +1247,9 @@ set_initial_firewall_policy() { set_main_ip + chmod +x /opt/so/saltstack/pillar/data/addtotab.sh + chmod +x /opt/so/saltstack/pillar/firewall/addfirewall.sh + case "$install_type" in 'MASTER') printf " - %s\n" "$MAINIP" | tee -a /opt/so/saltstack/pillar/firewall/minions.sls /opt/so/saltstack/pillar/firewall/masterfw.sls