From f84c2bf6d8cf1cbee975428f9268e4877825e7a9 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 17 Sep 2015 21:54:37 -0700 Subject: [PATCH] be explicit about our template path since others are calling us as a function --- plugins/nginx-vhosts/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 5dfeecac4..69b763cec 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -119,7 +119,7 @@ EOF if [[ -n "$SSL_INUSE" ]]; then SCHEME="https" - [[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$(dirname $0)/templates/nginx.ssl.conf.template" + [[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/nginx.ssl.conf.template" if [[ -z "$NO_VHOST" ]]; then SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true) else @@ -149,9 +149,9 @@ EOF fi if [[ -n "$DOKKU_SSL_TERMINATED" ]] && [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then - NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.ssl_terminated.template" + NGINX_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/nginx.conf.ssl_terminated.template" elif [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then - NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template" + NGINX_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/nginx.conf.template" fi if [[ -n "$NONSSL_VHOSTS" ]]; then