From 661b6706def14c1ad5e0f59fb597095cdad88efc Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 21 Apr 2015 10:58:11 -0700 Subject: [PATCH] fix verify_app_name to bomb on null app. use it in nginx:build-config --- plugins/common/functions | 1 + plugins/nginx-vhosts/commands | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/common/functions b/plugins/common/functions index da87b1300..8db3af6dd 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -104,6 +104,7 @@ dokku_container_log_verbose_quiet() { verify_app_name() { local APP="$1" + [[ ! -n "$APP" ]] && dokku_log_fail "(verify_app_name) APP must not be null" [[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist" IMAGE="dokku/$APP" return 0 diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index cafe92a28..19b48df10 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -28,6 +28,7 @@ restart_nginx () { case "$1" in nginx:build-config) APP="$2"; DOKKU_APP_LISTEN_PORT="$3"; DOKKU_APP_LISTEN_IP="${4}" + verify_app_name "$APP" VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" URLS_PATH="$DOKKU_ROOT/$APP/URLS" WILDCARD_SSL="$DOKKU_ROOT/tls"