simplify SSL hostname handling and avoid overwriting variables. refs #971

This commit is contained in:
Michael Hobbs committed 2015-02-12 13:27:47 -08:00
1 parent 64fa098d2c
commit 12777d9bf0
5 files changed
+46 -9

No files matched your search

+16
View File
@@ -12,6 +12,7 @@ teardown() {
destroy_app
[[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST"
[[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME"
disable_tls_wildcard
}
@test "nginx (no server tokens)" {
@@ -22,6 +23,21 @@ teardown() {
assert_failure
}
@test "nginx:build-config (wildcard SSL)" {
destroy_app
setup_test_tls_wildcard
create_app
run dokku domains:add $TEST_APP wildcard.dokku.me
echo "output: "$output
echo "status: "$status
assert_success
deploy_app
run bash -c "response=\"$(curl -LkSs wildcard.dokku.me)\"; echo \$response; test \"\$response\" == \"nodejs/express\""
echo "output: "$output
echo "status: "$status
assert_success
}
@test "nginx:build-config (with SSL CN mismatch)" {
setup_test_tls
deploy_app