From 50f7b4236b8433d8d5003cd4641f6f25c533bdfe Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 26 Mar 2015 14:33:10 -0400 Subject: [PATCH] Add .template suffix to nginx configuration templates. Refs #1054 --- plugins/nginx-vhosts/commands | 4 ++-- .../templates/{nginx.conf => nginx.conf.template} | 0 .../templates/{nginx.ssl.conf => nginx.ssl.conf.template} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename plugins/nginx-vhosts/templates/{nginx.conf => nginx.conf.template} (100%) rename plugins/nginx-vhosts/templates/{nginx.ssl.conf => nginx.ssl.conf.template} (100%) diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index ab8d6e245..13e601cdf 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -66,7 +66,7 @@ EOF SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$|^${SSL_HOSTNAME_ALT_REGEX}$" $VHOST_PATH || exit 0) NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME}$|^${SSL_HOSTNAME_ALT}$" $VHOST_PATH || exit 0) - NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.ssl.conf" + NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.ssl.conf.template" while read line; do dokku_log_info1 "Configuring SSL for $line..." SSL_SERVER_NAME=$line @@ -82,7 +82,7 @@ EOF eval "cat <<< \"$(< $APP_NGINX_TEMPLATE)\" > $NGINX_CONF" elif [[ -n "$NONSSL_VHOSTS" ]]; then xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS" - NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.conf" + NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.conf.template" eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF" fi diff --git a/plugins/nginx-vhosts/templates/nginx.conf b/plugins/nginx-vhosts/templates/nginx.conf.template similarity index 100% rename from plugins/nginx-vhosts/templates/nginx.conf rename to plugins/nginx-vhosts/templates/nginx.conf.template diff --git a/plugins/nginx-vhosts/templates/nginx.ssl.conf b/plugins/nginx-vhosts/templates/nginx.ssl.conf.template similarity index 100% rename from plugins/nginx-vhosts/templates/nginx.ssl.conf rename to plugins/nginx-vhosts/templates/nginx.ssl.conf.template