rename ssl terminated template to conform to naming scheme

This commit is contained in:
Michael Hobbs committed 2015-09-15 10:36:14 -07:00
1 parent 170f44f3d7
commit 964a84dc31
3 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -79,7 +79,7 @@ This could result in security issue, for example, if your application looks at t
## Customizing the nginx configuration ## 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. 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.
+1 -1
View File
@@ -112,7 +112,7 @@ EOF
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ') NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS" xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
if [[ -n "$DOKKU_SSL_TERMINATED" ]] && [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then 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 elif [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then
NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template" NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template"
fi fi