done with remove domain. whew.

[feisty_meow.git] / scripts / system / common_sysadmin.sh

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index d3dfbad1d5a793b9ff2f050aaa95d26ef337a0c5..81bc435cb8f9c605892caf6a17aba5e923b3d956 100644 (file)
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -14,6 +14,8 @@ function remove_domain_file()
     # don't destroy, just shuffle.
     \mv -f "$domain_file" "/tmp/$(basename ${domain_file})-old-${RANDOM}"
     test_or_die "removing domain file: $domain_file"
+  else
+    echo "Did not see a domain file to remove: $domain_file"
   fi
 }
 
@@ -125,8 +127,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,14 +154,13 @@ 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.
-  echo "
-${subdomain}.${containing_domain}.    IN A    ${IP_ADDRESS}
+  echo "${subdomain}.${containing_domain}.    IN A    ${IP_ADDRESS}
         IN HINFO \"linux server\" \"${DISTRO}\"
 " >> /etc/bind/${containing_domain}.conf