kind of cleanup

Author: A. Täffner

TODO.txt

@@ -13,10 +13,11 @@ Installer
 --------------------------------------
 
 - Add a function to let a server join a existing installation.
-Change named.options.conf and add follwoing lines into options-brackets for DNSSEC-Implementation:
+- Change named.options.conf and add follwoing lines into options-brackets for DNSSEC-Implementation:
 		dnssec-enable yes;
 		dnssec-validation yes;
 		dnssec-lookaside auto;
+- Add Package haveged to requirements as it raises available entropy by more than 1500 which is very needed for DNSSEC Key-generation
 
 Uninstaller
 --------------------------------------

install/tpl/dnssec-update.sh.master

@@ -2,10 +2,6 @@
 source {dnssec_conffile}
 pardomain="${1::-1}"
 
-echo "$0 $1 $2 $3 $4 results in domain: $pardomain" > /tmp/.last-call-to-dnssec-update
-
-
-
 if [ ! -d $backuppath ]; then mkdir -p $backuppath; fi
 #connect to database for testing
 mysqlcheck=`mysql -u $dbuser --password=$dbpass -h $dbhost -Bse "use $dbase; show tables;" | wc -c`
@@ -15,6 +11,10 @@ if [ "$mysqlcheck" = 0 ];then
  exit 0
 fi
 
+if [ ! -f .dsset-$pardomain ] ; then
+	{ispconfig_install_dir}/server/scripts/dnssec-create.sh $pardomain.
+fi
+
 mysqlcheck=`mysql -u $dbuser --password=$dbpass -h $dbhost -Bse "use $dbase; select id,serial from dns_soa where active='Y' and origin='$pardomain.';" | awk {' print $1":"$2 '}`
   echo $mysqlcheck
   zoneid=`echo $mysqlcheck | sed 's/:/ /g' | awk {' print $1 '}`