From c09e9bba2e193126b4a65771722ad99ce4a0225f Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Wed, 06 Mar 2019 19:39:22 +0100
Subject: [PATCH] merge IPv6 changes

---
 hsarback/src/de/hsadmin/mods/dom/zonefile.vm |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/zonefile.vm b/hsarback/src/de/hsadmin/mods/dom/zonefile.vm
index 7bb5e1a..b5d7a40 100644
--- a/hsarback/src/de/hsadmin/mods/dom/zonefile.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/zonefile.vm
@@ -1,24 +1,26 @@
 $TTL 6H
 ${dom.name}. IN SOA ${dom.dnsMaster}.hostsharing.net. hostmaster.hostsharing.net. (
-				${sio}	; serial secs since Jan 1 1970 
-				6H		; refresh (>=10000)
-				1H		; retry (>=1800)
-				1W		; expire
-				1H		; minimum
+        ${sio}  ; serial secs since Jan 1 1970
+        6H    ; refresh (>=10000)
+        1H    ; retry (>=1800)
+        1W    ; expire
+        1H    ; minimum
 )
 
-${dom.name}.			IN		NS	dns1.hostsharing.net.
-${dom.name}.			IN		NS	dns2.hostsharing.net.
-${dom.name}.			IN		NS	dns3.hostsharing.net.
+${dom.name}.      IN    NS  dns1.hostsharing.net.
+${dom.name}.      IN    NS  dns2.hostsharing.net.
+${dom.name}.      IN    NS  dns3.hostsharing.net.
 
-${dom.name}.			IN		MX	30 mailin1.hostsharing.net.
-${dom.name}.			IN		MX	30 mailin2.hostsharing.net.
-${dom.name}.			IN		MX	30 mailin3.hostsharing.net.
+${dom.name}.      IN    MX  30 mailin1.hostsharing.net.
+${dom.name}.      IN    MX  30 mailin2.hostsharing.net.
+${dom.name}.      IN    MX  30 mailin3.hostsharing.net.
 
-${dom.name}.			IN		A	${pac.curINetAddr.inetAddr}
+${dom.name}.      IN    A ${pac.curINetAddr.inetAddr}
+;${dom.name}.      IN    AAAA ${pac.curINet6Addr.inetAddr}
 
-*.${dom.name}.	   	    IN		MX	30 mailin1.hostsharing.net.
-*.${dom.name}.		    IN		MX	30 mailin2.hostsharing.net.
-*.${dom.name}.		    IN		MX	30 mailin3.hostsharing.net.
+*.${dom.name}.    IN    MX  30 mailin1.hostsharing.net.
+*.${dom.name}.    IN    MX  30 mailin2.hostsharing.net.
+*.${dom.name}.    IN    MX  30 mailin3.hostsharing.net.
 
-*.${dom.name}.		    IN		A   ${pac.curINetAddr.inetAddr}
+*.${dom.name}.    IN    A    ${pac.curINetAddr.inetAddr}
+;*.${dom.name}.    IN    AAAA ${pac.curINet6Addr.inetAddr}

--
Gitblit v1.9.0-SNAPSHOT