From 0403d27712aaaae201583c66178d7efacc6ee087 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 8 Sep 2013 10:16:09 +0000
Subject: [PATCH] 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 | 2 +-
 scripts/start.sh      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dns_update.sh b/scripts/dns_update.sh
index 05160279..abde310a 100755
--- a/scripts/dns_update.sh
+++ b/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
diff --git a/scripts/start.sh b/scripts/start.sh
index e164867e..873cc3a2 100755
--- a/scripts/start.sh
+++ b/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