make custom template tests actually test

This commit is contained in:
Michael Hobbs committed 2015-11-18 18:04:50 -05:00
1 parent 09aa97f9e5
commit 518d7f9e56
2 files changed
+5 -3

No files matched your search

+2
View File
@@ -98,6 +98,7 @@ assert_error_log() {
deploy_app deploy_app
assert_ssl_domain "wildcard1.dokku.me" assert_ssl_domain "wildcard1.dokku.me"
assert_ssl_domain "wildcard2.dokku.me" assert_ssl_domain "wildcard2.dokku.me"
assert_http_success "customssltemplate.dokku.me"
} }
@test "(nginx-vhosts) nginx:build-config (wildcard SSL & unrelated domain)" { @test "(nginx-vhosts) nginx:build-config (wildcard SSL & unrelated domain)" {
@@ -125,6 +126,7 @@ assert_error_log() {
custom_nginx_template custom_nginx_template
deploy_app deploy_app
assert_nonssl_domain "www.test.app.dokku.me" assert_nonssl_domain "www.test.app.dokku.me"
assert_http_success "customtemplate.dokku.me"
} }
@test "(nginx-vhosts) nginx:build-config (no global VHOST and domains:add)" { @test "(nginx-vhosts) nginx:build-config (no global VHOST and domains:add)" {
+3 -3
View File
@@ -183,14 +183,14 @@ cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template
server { server {
listen [::]:\$NGINX_PORT; listen [::]:\$NGINX_PORT;
listen \$NGINX_PORT; listen \$NGINX_PORT;
server_name \$NOSSL_SERVER_NAME; server_name \$NOSSL_SERVER_NAME customssltemplate.dokku.me;
return 301 https://\\\$host:\$NGINX_SSL_PORT\\\$request_uri; return 301 https://\\\$host:\$NGINX_SSL_PORT\\\$request_uri;
} }
server { server {
listen [::]:\$NGINX_SSL_PORT ssl spdy; listen [::]:\$NGINX_SSL_PORT ssl spdy;
listen \$NGINX_SSL_PORT ssl spdy; listen \$NGINX_SSL_PORT ssl spdy;
server_name \$SSL_SERVER_NAME; server_name \$SSL_SERVER_NAME customssltemplate.dokku.me;
\$SSL_DIRECTIVES \$SSL_DIRECTIVES
keepalive_timeout 70; keepalive_timeout 70;
@@ -218,7 +218,7 @@ cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf.template
server { server {
listen [::]:\$NGINX_PORT; listen [::]:\$NGINX_PORT;
listen \$NGINX_PORT; listen \$NGINX_PORT;
server_name \$NOSSL_SERVER_NAME; server_name \$NOSSL_SERVER_NAME customtemplate.dokku.me;
location / { location / {
proxy_pass http://\$APP; proxy_pass http://\$APP;