fix: re-register domainkeys when previously failed

opendkimd.sh

@@ -36,17 +36,27 @@ case $1 in
     dkey="$selc._domainkey.$SUTTY"
 
     # Do nothing if it already exists
-    test -f "$pkey" && exit 0
+    if test ! -f "$pkey"; then
+      # Remove old keys later
+      prev="`find $dir -name "*.private" -o -name "*.txt"`"
 
-    # Remove old keys later
+      ok "Generating new keys for selector ${selc}"
-    prev="`find $dir -name "*.private" -o -name "*.txt"`"
+      opendkim-genkey --directory=$dir  --selector=$selc --subdomains --domain=$SUTTY
 
-    ok "Generating new keys for selector ${selc}"
+      # Discard previous keys
-    opendkim-genkey --directory=$dir  --selector=$selc --subdomains --domain=$SUTTY
+      echo "$dkey $SUTTY:$selc:$pkey" > $key
+      echo "$SUTTY $dkey" > $sig
 
-    # Discard previous keys
+      if test -n "$prev"; then
-    echo "$dkey $SUTTY:$selc:$pkey" > $key
+        ok "Pruning old keypairs"
-    echo "$SUTTY $dkey" > $sig
+        rm -f $prev
+      fi
+
+      if test -f $pid ; then
+        ok "Reloading"
+        cat $pid | xargs -r kill -USR1
+      fi
+    fi
 
     txt="`cat $tkey | tr -d "\n" | cut -d '"' -f 2,4 | tr -d '"' | tr -d " "`"
 
@@ -54,6 +64,10 @@ case $1 in
     # continue anyway.
     ok "Registering public key records"
     for node in `drill -Q ns $SUTTY`; do
+      if drill -Q @${node} txt ${dkey} | grep -q "${txt}" ; then
+        ok "Records already registered for selector ${selc}"
+        continue
+      fi
 
       # Craft record
       cat >/tmp/dns <<DNS
@@ -78,15 +92,5 @@ DNS
         not_ok "Couldn't query ${dkey} at ${node}!"
       fi
     done
-
-    if test -n "$prev"; then
-      ok "Pruning old keypairs"
-      rm -f $prev
-    fi
-
-    if test -f $pid ; then
-      ok "Reloading"
-      cat $pid | xargs -r kill -USR1
-    fi
     ;;
 esac