feat: add ability to clear global domains

This commit is contained in:
Jose Diaz-Gonzalez committed 2019-05-13 12:00:26 -04:00
1 parent 948d507909
commit 287f383f6c
4 files changed
+28

No files matched your search

+1
View File
@@ -6,6 +6,7 @@
domains:add <app> <domain> [<domain> ...] # Add domains to app domains:add <app> <domain> [<domain> ...] # Add domains to app
domains:add-global <domain> [<domain> ...] # Add global domain names domains:add-global <domain> [<domain> ...] # Add global domain names
domains:clear <app> # Clear all domains for app domains:clear <app> # Clear all domains for app
domains:clear-global # Clear global domain names
domains:disable <app> # Disable VHOST support domains:disable <app> # Disable VHOST support
domains:enable <app> # Enable VHOST support domains:enable <app> # Enable VHOST support
domains:remove <app> <domain> [<domain> ...] # Remove domains from app domains:remove <app> <domain> [<domain> ...] # Remove domains from app
+8
View File
@@ -176,6 +176,14 @@ domains_add_global() {
done 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() { domains_remove_global() {
declare desc="remove list of domains" declare desc="remove list of domains"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
+1
View File
@@ -91,6 +91,7 @@ domains_help_content_func() {
domains:add <app> <domain> [<domain> ...], Add domains to app domains:add <app> <domain> [<domain> ...], Add domains to app
domains:add-global <domain> [<domain> ...], Add global domain names domains:add-global <domain> [<domain> ...], Add global domain names
domains:clear <app>, Clear all domains for app domains:clear <app>, Clear all domains for app
domains:clear-global, Clear global domain names
domains:disable <app>, Disable VHOST support domains:disable <app>, Disable VHOST support
domains:enable <app>, Enable VHOST support domains:enable <app>, Enable VHOST support
domains:remove <app> <domain> [<domain> ...], Remove domains from app domains:remove <app> <domain> [<domain> ...], Remove domains from app
+18
View File
@@ -234,6 +234,24 @@ teardown() {
assert_success 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" { @test "(domains) domains:remove-global" {
run /bin/bash -c "dokku domains:add-global global.dokku.me" run /bin/bash -c "dokku domains:add-global global.dokku.me"
echo "output: $output" echo "output: $output"