From 883c7d98dd2fdead2cf1e0c945f293419d40e003 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 14 Nov 2017 23:16:11 -0500 Subject: [PATCH] nearly live --- scripts/core/functions.sh | 2 +- scripts/system/common_sysadmin.sh | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 7b732160..8772dfdc 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -903,7 +903,7 @@ echo ongoing skip count is now $skip_count #put the file back into place. echo file we created looks like this: -filedump "$new_version" +cat "$new_version" \mv "$new_version" "$filename" test_or_die "moving the new version into place in: $filename" diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh index d3dfbad1..af0cf3db 100644 --- a/scripts/system/common_sysadmin.sh +++ b/scripts/system/common_sysadmin.sh @@ -125,8 +125,7 @@ function remove_subdomain() return 0 fi - create_chomped_copy_of_file "$domain_file" \ - "${subdomain}.*${containing_domain} *IN *A *${IP_ADDRESS}" 1 + create_chomped_copy_of_file "$domain_file" "${old_domain}" 2 } # adds a new subdomain under a containing domain. @@ -153,9 +152,9 @@ function add_new_subdomain() if grep -q "$new_domain" "$domain_file"; then echo "The subdomain $subdomain already seems to exist in the domain" echo "configuration file: $domain_file" - echo "Please edit the config file to remove the subdomain before trying" - echo "to re-add the subdomain." - exit 1 + echo "We are considering our work done; if you want to modify the subdomain," + echo "then please call remove_domain on it first." + return 0 fi # append the new subdomain into the config file. -- 2.34.1