diff -r 5509b98ea064 -r 5786a8b53c78 zone-mk
--- a/zone-mk	Wed Jul 14 12:05:41 2010 +0200
+++ b/zone-mk	Wed Jul 14 15:37:27 2010 +0200
@@ -72,25 +72,17 @@
 	test -f $zonefile && { echo "$zonefile exists. Skipping $domain" >&2; continue; }
 	test -f $config && { echo "$config exists. Skipping $domain" >&2; continue; }
 
-	cat <<xxx >$zonefile
-\$ORIGIN $domain.
-\$TTL 1d
-@		IN SOA $primary. $hostmaster. (
-		$(date +%Y%m%d00)	; serial
-		1d		; refresh
-		2h		; retry
-		7d		; expire
-		1d		; default ttl
-)
-
-		IN TXT		"invoice: $customer"
-		IN TXT		"start: $start"
-		IN TXT		"utf8: $utf8domain"
-
-		IN NS		$primary.
-		IN NS		$secondary.
-
-xxx
+        tpage \
+                --define start="$start" \
+                --define domain="$domain" \
+                --define time="$(date +%Y%m%d00)" \
+                --define primary="$primary" \
+		--define secondary="$secondary" \
+                --define hostmaster="$hostmaster" \
+                --define customer="$customer" \
+                --define utf8domain="$utf8domain" \
+                templates/named.zone \
+        >$zonefile
 
 	tpage \
 		--define domain="$domain" \
@@ -100,7 +92,7 @@
 		--define file="$master_dir/$domain/$domain" \
 		--define primary_ip="$primary_ip" \
 		--define secondary_ip="$secondary_ip" \
-		templates/named.conf.zone \
+		templates/named.config \
 	>$config
 
 done