diff --git a/docs/configuration/domains.md b/docs/configuration/domains.md index 1fc18556c..2bde4185f 100644 --- a/docs/configuration/domains.md +++ b/docs/configuration/domains.md @@ -6,6 +6,7 @@ domains:add [ ...] # Add domains to app domains:add-global [ ...] # Add global domain names domains:clear # Clear all domains for app +domains:clear-global # Clear global domain names domains:disable # Disable VHOST support domains:enable # Enable VHOST support domains:remove [ ...] # Remove domains from app diff --git a/plugins/domains/functions b/plugins/domains/functions index 97e166ada..d0c6b8767 100755 --- a/plugins/domains/functions +++ b/plugins/domains/functions @@ -176,6 +176,14 @@ domains_add_global() { done } +domains_clear_global() { + declare desc="remove all domains" + local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" + + rm "$GLOBAL_VHOST_PATH" + touch "$GLOBAL_VHOST_PATH" +} + domains_remove_global() { declare desc="remove list of domains" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" diff --git a/plugins/domains/internal-functions b/plugins/domains/internal-functions index 3897eef23..43267fe09 100755 --- a/plugins/domains/internal-functions +++ b/plugins/domains/internal-functions @@ -91,6 +91,7 @@ domains_help_content_func() { domains:add [ ...], Add domains to app domains:add-global [ ...], Add global domain names domains:clear , Clear all domains for app + domains:clear-global, Clear global domain names domains:disable , Disable VHOST support domains:enable , Enable VHOST support domains:remove [ ...], Remove domains from app diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats index 264246b2c..48192a4d0 100644 --- a/tests/unit/20_domains.bats +++ b/tests/unit/20_domains.bats @@ -234,6 +234,24 @@ teardown() { assert_success } +@test "(domains) domains:clear-global" { + run /bin/bash -c "dokku domains:add-global global.dokku.invalid" + echo "output: $output" + echo "status: $status" + assert_success + + run /bin/bash -c "dokku domains:add-global global.dokku.me" + echo "output: $output" + echo "status: $status" + assert_success + + run /bin/bash -c "dokku domains:clear-global" + echo "output: $output" + echo "status: $status" + refute_line "global.dokku.invalid" + refute_line "global.dokku.me" +} + @test "(domains) domains:remove-global" { run /bin/bash -c "dokku domains:add-global global.dokku.me" echo "output: $output"