X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fcommon_sysadmin.sh;h=15e112707c67b864816e6e4d882394190ff2456a;hb=d02fd8562e2cc1fe56edd0ef9308a9a04302c2b1;hp=5c99865dcb7c5a83eda1d8f83dd5bf95999255ae;hpb=3a15a125fe2c4c54611f83a7c24e16f14e1c6c90;p=feisty_meow.git

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 5c99865d..15e11270 100644
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -11,7 +11,8 @@ function remove_domain_file()
 
   local domain_file="/etc/bind/${domain_name}.conf"
   if [ -f "$domain_file" ]; then
-    \rm -f "$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"
   fi
 }
@@ -64,44 +65,9 @@ function remove_zone_for_domain()
 
   local domain_file="/etc/bind/${domain_name}.conf"
 
-  \cp -f "$domain_file" "$domain_file.bkup-${RANDOM}" 
-  test_or_die "backing up domain file: $domain_file"
-
-  # temp file to write to before we move file into place in bind.
-  local new_version="/tmp/$domain_file.bkup-${RANDOM}" 
-  \rm -f "$new_version"
-  test_or_die "cleaning out new version of domain file from : $new_version"
-
-  local line
-  local skip_count=0
-  while read line; do
-    # don't bother looking at the lines if we're already in skip mode.
-    if [[ $skip_count == 0 ]]; then
-      # find the zone for the domain.
-      if [[ ! "$line" =~ *"zone \"${domain_name}\""* ]]; then
-        echo "$line" >> "$new_version"
-      else
-        # start skipping.  we will delete this line and the next 6 lines.
-        ((skip_count++))
-echo first skip count is now $skip_count
-      fi
-    else
-      # we're already skipping.  let's keep going until we hit the limit.
-      ((skip_count++))
-      if [[ $skip_count >= 6 ]]; then
-        echo "Done skipping, and back to writing output file."
-        skip_count=0
-      fi
-    fi
-  done < "$domain_file"
-
-#put the file back into place.
-echo file we created looks like this:
-filedump "$new_version"
-
-echo bailing
-exit 1
-
+  # eat the zone file definition.  this will botch up badly if more text was added
+  # or the zone info shrank.
+  create_chomped_copy_of_file "/etc/bind/named.conf.local" "zone.*${domain_name}" 6
 }
 
 # hooks up a new config file into bind's list of zones.
@@ -129,7 +95,38 @@ zone \"${domain_name}\" in {
   # keep ownership for the real user.
   chown "$(logname):$(logname)" /etc/bind/named.conf.local
   test_or_die "setting ownership on: /etc/bind/named.conf.local"
+}
+
+# zaps a subdomain out of the containing domain file.
+function remove_subdomain()
+{
+  local old_domain="$1"; shift
+
+  # split up the full domain name into subdomain portion and containing domain.
+  local subdomain="${old_domain%.*.*}"
+  local containing_domain="${old_domain#*.}"
+
+  echo "removing subdomain $subdomain from containing domain $containing_domain"
+
+  local domain_file="/etc/bind/${containing_domain}.conf"
+  # see if config file already exists; if not, complain.
+  if [ ! -f "$domain_file" ]; then
+    echo "The domain configuration file for $old_domain is missing."
+    echo "It should already be present in: $domain_file"
+    echo "We cannot remove a subdomain if the containing domain isn't there."
+    exit 1
+  fi
+
+  # see if subdomain already present in config.
+  if [ ! $(grep -q "$old_domain" "$domain_file") ]; then
+    echo "The subdomain $subdomain is already missing from the domain"
+    echo "configuration file: $domain_file"
+    echo "Our work is apparently done for removing it."
+    return 0
+  fi
 
+  create_chomped_copy_of_file "$domain_file" \
+      "${subdomain}.*${containing_domain} *IN *A *${IP_ADDRESS}" 1
 }
 
 # adds a new subdomain under a containing domain.