Changeset 1971

Timestamp:

10/04/07 20:50:41 (7 months ago)

Author:

anarcat

Message:

add debugging mode (-d) that shows what domains are updated and what wget is doing

do sanity checks on the domain list provided and bail out on the first error

tell wget to be quiet

Files:

• alternc-slavedns/trunk/slavedns (modified) (4 diffs)

alternc-slavedns/trunk/slavedns

@@ -9 +9 @@
-WGETRC=${HOME}/.wgetrc
-WGET=wget
-
+-q
-NAMED="/etc/init.d/bind restart" 
-DEFAULTS="defaults.conf"
-DEFAULTSFILE="${CONFDIR}/${DEFAULTS}"
+DEBUG=false
-
-for i
-do
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-done
-
@@ -35 +42 @@
-CreateBindConf() {
-    CFILE="$1"
-rm -f ${BINDDIR}/${CFILE}
+# create a new config for this host, in a tempfile
-    while read domain
-    do
+      # check if the data is valid, this will also display the domain in debug mode
+      if ! echo $domain | grep -i '^\([a-z][a-z0-9]*\.\)*[a-z][a-z0-9]*$' | MaybeCat
+      then
+          echo invalid domain listing: $domain, skipping file $CFILE >&2
+          return
+      fi
-      cat >> ${BINDDIR}/${CFILE}.$$ <<EOF
-zone "$domain" {
@@ -69 +82 @@
-ResetWgetConf() {
-    mv -f ${WGETRC}.$$ ${WGETRC} 2>/dev/null || rm -f ${WGETRC}
+}
+
+MaybeCat() {
+    if $DEBUG
+    then
+        cat
+    else
+        cat > /dev/null
+    fi
+    return 0
-}
-
@@ -105 +128 @@
-      rm -f ${CACHEDIR}/${conf}.temp
-      [ "${LOGIN}" ] && SetWgetPass ${LOGIN} ${PASSWORD}
-/dev/null
+&1 | MaybeCat
-      [ "${LOGIN}" ] && ResetWgetConf
-      if [ -s "${CACHEDIR}/${conf}.temp" ]