include new port variables in custom nginx templates

This commit is contained in:
Michael Hobbs committed 2015-09-17 22:32:57 -07:00
1 parent f84c2bf6d8
commit e07ae7ad6a
1 file changed
+8 -8
+8 -8
View File
@@ -175,20 +175,20 @@ custom_ssl_nginx_template() {
[[ -z "$APP" ]] && APP="$TEST_APP" [[ -z "$APP" ]] && APP="$TEST_APP"
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template
server { server {
listen [::]:80; listen [::]:\$NGINX_PORT;
listen 80; listen \$NGINX_PORT;
server_name \$NOSSL_SERVER_NAME; server_name \$NOSSL_SERVER_NAME;
return 301 https://\$SSL_SERVER_NAME\\\$request_uri; return 301 https://\\\$host:\$NGINX_SSL_PORT\\\$request_uri;
} }
server { server {
listen [::]:443 ssl spdy; listen [::]:\$NGINX_SSL_PORT ssl spdy;
listen 443 ssl spdy; listen \$NGINX_SSL_PORT ssl spdy;
server_name \$SSL_SERVER_NAME; server_name \$SSL_SERVER_NAME;
\$SSL_DIRECTIVES \$SSL_DIRECTIVES
keepalive_timeout 70; keepalive_timeout 70;
add_header Alternate-Protocol 443:npn-spdy/2; add_header Alternate-Protocol \$NGINX_SSL_PORT:npn-spdy/2;
location / { location / {
proxy_pass http://\$APP; proxy_pass http://\$APP;
proxy_http_version 1.1; proxy_http_version 1.1;
@@ -210,8 +210,8 @@ custom_nginx_template() {
[[ -z "$APP" ]] && APP="$TEST_APP" [[ -z "$APP" ]] && APP="$TEST_APP"
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template
server { server {
listen [::]:80; listen [::]:\$NGINX_PORT;
listen 80; listen \$NGINX_PORT;
server_name \$NOSSL_SERVER_NAME; server_name \$NOSSL_SERVER_NAME;
location / { location / {