set the DNS SOA RNAME domain contact email to hostmaster@PRIMARY_HOSTNAME and...

set the DNS SOA RNAME domain contact email to hostmaster@PRIMARY_HOSTNAME and add an alias when creating the first mail user

scripts/dns_update.sh

@@ -69,7 +69,7 @@ for fn in $STORAGE_ROOT/dns/*.txt; do
 \$ORIGIN $zone.    ; default zone domain
 \$TTL 86400           ; default time to live
 
-@ IN SOA ns1.$zone. domain_contact.$zone. (
+@ IN SOA ns1.$zone. hostmaster.$PRIMARY_HOSTNAME. (
            $serial     ; serial number
            28800       ; Refresh
            7200        ; Retry

scripts/start.sh

@@ -69,5 +69,6 @@ if [ -z `tools/mail.py user` ]; then
 	echo "Let's create your first mail user."
 	read -e -i "user@`hostname`" -p "Email Address: " EMAIL_ADDR
 	tools/mail.py user add $EMAIL_ADDR # will ask for password
+	tools/mail.py alias add hostmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR
 fi