fixing alternc.install diff + removing domain in opendkim in functions_dns

src/functions_dns.sh

@@ -93,6 +93,12 @@ dns_delete() {
   local file=$(cat "$NAMED_CONF")
   echo -e "$file" |grep -v "\"$domain\"" > "$NAMED_CONF"
 
+  # Remove the conf from openDKIM
+  rm -rf "/etc/opendkim/keys/$domain"
+  grep -v "^$domain\$" /etc/opendkim/TrustedHosts >/etc/opendkim/TrustedHosts.alternc-tmp && mv /etc/opendkim/TrustedHosts.alternc-tmp /etc/opendkim/TrustedHosts
+  grep -v "^alternc._domainkey.$domain " /etc/opendkim/KeyTable >/etc/opendkim/KeyTable.alternc-tmp && mv /etc/opendkim/KeyTable.alternc-tmp /etc/opendkim/KeyTable
+  grep -v "^$domain alternc._domainkey.$domain\$" /etc/opendkim/SigningTable >/etc/opendkim/SigningTable.alternc-tmp && mv /etc/opendkim/SigningTable.alternc-tmp /etc/opendkim/SigningTable
+  
   # Ask the dns server for restart
   $RNDC reconfig
   # Hook it !

wheezy/alternc.install.diff

@@ -1,6 +1,6 @@
---- alternc.install	2013-06-14 18:13:46.000000000 +0200
-+++ alternc.install.wheezy	2013-06-14 18:17:16.694449173 +0200
-@@ -77,7 +77,7 @@
+--- alternc.install	2013-08-22 09:16:54.818542162 +0200
++++ alternc.install.wheezy	2013-08-22 09:58:06.713339922 +0200
+@@ -78,7 +78,7 @@
  fi
  
  if [ -e /etc/dovecot/dovecot.conf ]; then
@@ -9,7 +9,7 @@
  fi
  
  INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-@@ -306,7 +306,7 @@
+@@ -305,7 +305,7 @@
          fi
  
  	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
@@ -18,7 +18,7 @@
  
      else
          # We disable proftpd tls module
-@@ -315,7 +315,7 @@
+@@ -314,7 +314,7 @@
          cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
  
  	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
@@ -27,7 +27,7 @@
  
          echo "SSL not configured"
          echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-@@ -531,9 +531,11 @@
+@@ -533,9 +533,11 @@
      fi
  fi