Merge pull request #13 from devilbox/release-0.18

Fix unbound variable in silent mode
devilbox · Jul 25, 2018 · 93a5e30 · 93a5e30
2 parents b893e55 + 353a8c5
commit 93a5e30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/create-vhost.sh b/data/create-vhost.sh
@@ -10,8 +10,8 @@ VHOST_TLD="${3}"
 VHOST_TPL="${4}"
 CA_KEY="${5}"
 CA_CRT="${6}"
-VERBOSE="${7}"
-GENERATE_SSL="${8}"
+GENERATE_SSL="${7}"
+VERBOSE="${8:-}"
 
 if [ "${GENERATE_SSL}" = "1" ]; then
 	if [ ! -d "/etc/httpd/cert/mass" ]; then

diff --git a/data/docker-entrypoint.sh b/data/docker-entrypoint.sh
@@ -222,7 +222,7 @@ if [ "${MASS_VHOST_ENABLE}" -eq "1" ]; then
 	fi
 
 	# Create watcherd sub commands
-	watcherd_add="create-vhost.sh '%%p' '%%n' '${MASS_VHOST_TLD}' '%%p/${MASS_VHOST_TPL}/' '${CA_KEY}' '${CA_CRT}' '${verbose}' '1'"
+	watcherd_add="create-vhost.sh '%%p' '%%n' '${MASS_VHOST_TLD}' '%%p/${MASS_VHOST_TPL}/' '${CA_KEY}' '${CA_CRT}' '1' '${verbose}'"
 	watcherd_del="rm /etc/httpd/vhost.d/%%n.conf"
 	watcherd_tri="${HTTPD_RELOAD}"