opendkimd.sh

@@ -36,28 +36,17 @@ case $1 in
     dkey="$selc._domainkey.$SUTTY"
 
     # Do nothing if it already exists
-    if test ! -f "$pkey"; then
-      # Remove old keys later
-      prev="`find $dir -name "*.private" -o -name "*.txt"`"
+    test -f "$pkey" && exit 0
 
-      ok "Generating new keys for selector ${selc}"
-      opendkim-genkey --directory=$dir  --selector=$selc --subdomains --domain=$SUTTY
-      chown -R opendkim:opendkim /etc/opendkim
+    # Remove old keys later
+    prev="`find $dir -name "*.private" -o -name "*.txt"`"
 
-      # Discard previous keys
-      echo "$dkey $SUTTY:$selc:$pkey" > $key
-      echo "$SUTTY $dkey" > $sig
+    ok "Generating new keys for selector ${selc}"
+    opendkim-genkey --directory=$dir  --selector=$selc --subdomains --domain=$SUTTY
 
-      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
-    fi
+    # Discard previous keys
+    echo "$dkey $SUTTY:$selc:$pkey" > $key
+    echo "$SUTTY $dkey" > $sig
 
     txt="`cat $tkey | tr -d "\n" | cut -d '"' -f 2,4 | tr -d '"' | tr -d " "`"
 
@@ -65,10 +54,6 @@ 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
@@ -93,5 +78,15 @@ 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