staging: deploy garage 0.10 beta + fix monitoring

1 files changed, 2 insertions, 5 deletions

diff --git a/deploy_pki b/deploy_pki
index f9a4106..1ab2b35 100755
--- a/deploy_pki
+++ b/deploy_pki
@@ -19,10 +19,7 @@ cmd ln -sf /var/lib/consul/pki/consul$YEAR.key /var/lib/consul/pki/consul.key
 cmd ln -sf /var/lib/consul/pki/consul$YEAR-client.crt /var/lib/consul/pki/consul-client.crt
 cmd ln -sf /var/lib/consul/pki/consul$YEAR-client.key /var/lib/consul/pki/consul-client.key
 
-
 cmd systemctl reload consul
-cmd sleep 10
-
 
 for file in nomad-ca.crt nomad$YEAR.crt nomad$YEAR.key \
 	nomad$YEAR-client.crt nomad$YEAR-client.key \
@@ -30,8 +27,8 @@ for file in nomad-ca.crt nomad$YEAR.crt nomad$YEAR.key \
 do
 	if pass $PKI/$file >/dev/null; then
 		write_pass $PKI/$file /var/lib/nomad/pki/$file
-		if [ "$CLUSTER" = "prod" ]; then
-		   cmd "chown \$(stat -c %u /var/lib/private/nomad/) /var/lib/nomad/pki/$file"
+		if [ ! "$CLUSTER" = "staging" ]; then
+			cmd "chown \$(stat -c %u /var/lib/private/nomad/) /var/lib/nomad/pki/$file"
 		fi
 	fi
 done