X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fcommon_sysadmin.sh;h=81bc435cb8f9c605892caf6a17aba5e923b3d956;hb=f9cdfb4f177d9ab6cb7ce02ef57964d5d019eeb6;hp=7ca026ad642fa56790247dc4de507cb3856b6404;hpb=6c092ddd89f370977ea96dd63165ba56693fb7f4;p=feisty_meow.git

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 7ca026ad..81bc435c 100644
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -4,10 +4,20 @@
 #
 # Author: Chris Koeritz
 
-#export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
-#export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
+# removes a full domain from the DNS.
+function remove_domain_file()
+{
+  local domain_name="$1"; shift
 
-#source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
+  local domain_file="/etc/bind/${domain_name}.conf"
+  if [ -f "$domain_file" ]; then
+    # 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
+}
 
 # creates a totally new domain config file for DNS.
 function write_new_domain_file()
@@ -50,6 +60,18 @@ ${domain_name}.	IN A	${IP_ADDRESS}
   test_or_die "setting ownership on: $domain_file"
 }
 
+# takes a zone back out of the local conf file for bind
+function remove_zone_for_domain()
+{
+  local domain_name="$1"; shift
+
+  local domain_file="/etc/bind/${domain_name}.conf"
+
+  # 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.
 function add_zone_for_new_domain()
 {
@@ -75,7 +97,37 @@ 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" "${old_domain}" 2
 }
 
 # adds a new subdomain under a containing domain.
@@ -99,17 +151,16 @@ function add_new_subdomain()
   fi
 
   # see if subdomain already present in config.
-  if [ $(grep -q "$new_domain" "$domain_file") ]; then
+  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