From 964a84dc31af8d4d453310a07b140c3a3e2e4923 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 15 Sep 2015 10:32:10 -0700 Subject: [PATCH] rename ssl terminated template to conform to naming scheme --- docs/nginx.md | 2 +- plugins/nginx-vhosts/commands | 2 +- ...nginx.terminated.conf => nginx.conf.ssl_terminated.template} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename plugins/nginx-vhosts/templates/{nginx.terminated.conf => nginx.conf.ssl_terminated.template} (100%) diff --git a/docs/nginx.md b/docs/nginx.md index 5fcec99b2..1490a7c3b 100644 --- a/docs/nginx.md +++ b/docs/nginx.md @@ -79,7 +79,7 @@ This could result in security issue, for example, if your application looks at t ## Customizing the nginx configuration -> New as of 0.3.17. +> New as of 0.4.0. Dokku currently templates out an nginx configuration that is included in the `nginx-vhosts` plugin. If you'd like to provide a custom template for your application, you should copy the existing template - ssl or non-ssl - into your application repository's root directory as the file `nginx.conf.template`. The next time you deploy, Nginx will use your template instead of the default. diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands index c69bf40b5..c6a47e6e9 100755 --- a/plugins/nginx-vhosts/commands +++ b/plugins/nginx-vhosts/commands @@ -112,7 +112,7 @@ EOF NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ') xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS" if [[ -n "$DOKKU_SSL_TERMINATED" ]] && [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then - NGINX_TEMPLATE="$(dirname $0)/templates/nginx.terminated.conf" + NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.ssl_terminated.template" elif [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template" fi diff --git a/plugins/nginx-vhosts/templates/nginx.terminated.conf b/plugins/nginx-vhosts/templates/nginx.conf.ssl_terminated.template similarity index 100% rename from plugins/nginx-vhosts/templates/nginx.terminated.conf rename to plugins/nginx-vhosts/templates/nginx.conf.ssl_terminated.template