Use skeletons CNAME-X CNAME-X-wildcard.

14 files changed, 216 insertions, 312 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index d5fb244..c63c922 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NS localhost.
 
-* CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *
diff --git a/bind/fake-222/JONES-www b/bind/fake-222/JONES-www
index 1cdce1a..5cbde0b 100644
--- a/bind/fake-222/JONES-www
+++ b/bind/fake-222/JONES-www
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NS localhost.
 
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/JONES-www+source b/bind/fake-222/JONES-www+source
index 308d82a..9310773 100644
--- a/bind/fake-222/JONES-www+source
+++ b/bind/fake-222/JONES-www+source
@@ -7,5 +7,5 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NS localhost.
 
-source CNAME xayide.jones.dk.
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/JONES-www+source+admin+media b/bind/fake-222/JONES-www+source+admin+media
index 228f431..f55143b 100644
--- a/bind/fake-222/JONES-www+source+admin+media
+++ b/bind/fake-222/JONES-www+source+admin+media
@@ -7,7 +7,7 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NS localhost.
 
-admin CNAME xayide.jones.dk.
-media CNAME morla.jones.dk.
-source CNAME xayide.jones.dk.
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media
diff --git a/bind/fake-222/JONES-www-nomail b/bind/fake-222/JONES-www-nomail
index a5a8f41..566663f 100644
--- a/bind/fake-222/JONES-www-nomail
+++ b/bind/fake-222/JONES-www-nomail
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
  NS localhost.
 
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 1fe03ed..4cbea12 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -206,163 +206,116 @@ msg CNAME coreander
 *.msg CNAME coreander
 
 ; Public local services (use CNAME)
-*.mail CNAME xayide
-www CNAME xayide
-*.www CNAME xayide
-ftp CNAME xayide
-abrao CNAME xayide
-*.abrao CNAME xayide
-tasekbera CNAME xayide ; "Owner=Chrois" "Desc=Tourism in Koala Lumpur"
-demo CNAME xayide ; "Desc=jones.dk temporary demo site"
-*.demo CNAME xayide ; "Desc=jones.dk temporary demo site"
-bund CNAME xayide ; "Owner=Esben Stephansen" "Desc=Bundproductions"
-*.bund CNAME xayide
-ledger CNAME xayide
-afp CNAME xayide
-anja CNAME xayide
-ane CNAME xayide
-ascanius CNAME xayide
-automata CNAME xayide
-blaagaard CNAME xayide
-bos CNAME xayide
-cgi CNAME xayide
-chat CNAME xayide
-*.chat CNAME xayide
-conference CNAME xayide
-*.conference CNAME xayide
-msn CNAME xayide
-*.msn CNAME xayide
-irc CNAME xayide
-computersmerter CNAME xayide
-christen CNAME xayide
-deb CNAME morla
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *.mail
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ane
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME anja
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ascanius
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME automata
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME blaagaard
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME bos
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME cgi
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME christen
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME computersmerter
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME craignative ; "Owner=Jacob Valdemar"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME diskurs
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME dive
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME felicia
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME floppyfw
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME forum
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ftp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME gift-economy
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME helbak
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME iki
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME irc
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME kalender
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME kimkim
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ledger
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME leif
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME lichtraum
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME lyrik
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME morgan
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME nicolai
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME o2
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ordet
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME peronard
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME peter
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME search
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME soundfactory
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME stats
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME sundbykajak
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME swing
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME tasekbera ; "Owner=Chrois" "Desc=Tourism in Koala Lumpur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME toolbox
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME vestergror
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME wap
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME webmail
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME webtools
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME workingday
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME xn--gavekonomi-3cb
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME yuffies
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X abrao
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X admin
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X boot
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X bund ; "Owner=Esben Stephansen" "Desc=Bundproductions"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X chat
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X china
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X conception ; "Owner=Jasper"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X conference
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X cyberhus
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X danmark
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X data
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X dbk ; "Desc=Den Blaa Kanin"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X demo ; "Desc=jones.dk temporary demo site"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X fest
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X files
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X firdaus
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X foto ; "Owner=Stine" "Desc=Nicaragua tur-retur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X helloearth
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X horde
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ibsen
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ie ; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X imp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X jgh ; "Owner=Jacob Gorm"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X lux ; "Owner=Christen Stephansen"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X malene ; "Desc=Malenes foto-galleri"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X mirrors
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X msn
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X munkefoto
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X munkefotos
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X nande
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X otto
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X phone
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X photo ; "Owner=Stine" "Desc=Nicaragua tur-retur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ronald ; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X samsul
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X sayed
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X shell
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X siri
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X steiner
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X surya
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X teatroglimt ; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X trekroner ; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X users
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X visensvenner
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X wall
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud deb
 debian CNAME coreander
 *.debian CNAME coreander
-diskurs CNAME xayide
-dive CNAME xayide
-felicia CNAME xayide
-fest CNAME xayide
-*.fest CNAME xayide
-floppyfw CNAME xayide
-xn--gavekonomi-3cb CNAME xayide
-gift-economy CNAME xayide
-helbak CNAME xayide
-iki CNAME xayide
-kimkim CNAME xayide
-leif CNAME xayide
-lichtraum CNAME xayide
-lyrik CNAME xayide
-morgan CNAME xayide
-nicolai CNAME xayide
-o2 CNAME xayide
-ordet CNAME xayide
-peronard CNAME xayide
-peter CNAME xayide
-search CNAME xayide
-siri CNAME xayide
-*.siri CNAME xayide
 asbjorn CNAME coreander
 *.asbjorn CNAME coreander
-soundfactory CNAME xayide
-stats CNAME xayide
-sundbykajak CNAME xayide
-swing CNAME xayide
-vestergror CNAME xayide
-wap CNAME xayide
-workingday CNAME xayide
-yuffies CNAME xayide
-china CNAME xayide
-*.china CNAME xayide
-ibsen CNAME xayide
-*.ibsen CNAME xayide
 cvs CNAME coreander
 svn CNAME coreander
-teatroglimt CNAME xayide ; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
-*.teatroglimt CNAME xayide
-malene CNAME xayide ; "Desc=Malenes foto-galleri"
-*.malene CNAME xayide
-webmail CNAME xayide
-webtools CNAME xayide ; "Desc=Webtools"
-forum CNAME xayide
-kalender CNAME xayide
-toolbox CNAME xayide
 img CNAME coreander
 *.img CNAME coreander
-imp CNAME xayide
-*.imp CNAME xayide
-horde CNAME xayide
-*.horde CNAME xayide
-danmark CNAME xayide
-*.danmark CNAME xayide
-data CNAME xayide
-*.data CNAME xayide
-dbk CNAME xayide ; "Desc=Den Blaa Kanin"
-*.dbk CNAME xayide
-nande CNAME xayide ; "Desc=Nande"
-*.nande CNAME xayide
-foto CNAME xayide ; "Owner=Stine" "Desc=Nicaragua tur-retur"
-*.foto CNAME xayide
-phone CNAME xayide
-*.phone CNAME xayide
-photo CNAME xayide
-*.photo CNAME xayide
-visensvenner CNAME xayide
-*.visensvenner CNAME xayide
-ronald CNAME xayide ; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
-*.ronald CNAME xayide
-jgh CNAME xayide ; "Owner=Jacob Gorm"
-*.jgh CNAME xayide
-lux CNAME xayide ; "Owner=Christen Stephansen"
-*.lux CNAME xayide
-conception CNAME xayide ; "Owner=Jasper"
-*.conception CNAME xayide
-ie CNAME xayide ; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
-*.ie CNAME xayide
-craignative CNAME xayide ; "Owner=Jacob Valdemar"
 wiki CNAME coreander
 *.wiki CNAME coreander
-trekroner CNAME xayide ; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
-*.trekroner CNAME xayide
-steiner CNAME xayide
-*.steiner CNAME xayide
-admin CNAME xayide
-*.admin CNAME xayide
-firdaus CNAME xayide
-*.firdaus CNAME xayide
-munkefoto CNAME xayide
-*.munkefoto CNAME xayide
-munkefotos CNAME xayide
-*.munkefotos CNAME xayide
-mirrors CNAME xayide
-*.mirrors CNAME xayide
-files CNAME xayide
-*.files CNAME xayide
 log CNAME slamuf
 *.log CNAME slamuf
 backup CNAME slamuf
 *.backup CNAME slamuf
-shell CNAME xayide
-*.shell CNAME xayide
-otto CNAME xayide
-*.otto CNAME xayide
-source CNAME xayide
-*.source CNAME xayide
-samsul CNAME xayide
-*.samsul CNAME xayide
-sayed CNAME xayide
-*.sayed CNAME xayide
-surya CNAME xayide
-*.surya CNAME xayide
-users CNAME xayide
-*.users CNAME xayide
-boot CNAME xayide
-*.boot CNAME xayide
-helloearth CNAME xayide
-*.helloearth CNAME xayide
-cyberhus CNAME xayide
-*.cyberhus CNAME xayide
-wall CNAME xayide
-*.wall CNAME xayide
 
 ; Private zone roots, mailhubs and non-CNAME services (use A)
 
diff --git a/bind/fake-222/kassandra-production.dk b/bind/fake-222/kassandra-production.dk
index 7cbb938..2beb9ee 100644
--- a/bind/fake-222/kassandra-production.dk
+++ b/bind/fake-222/kassandra-production.dk
@@ -7,7 +7,6 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NS localhost.
 
-www CNAME xayide.jones.dk.
-
-omni CNAME xayide.jones.dk.
-www.omni CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME omni
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www.omni
diff --git a/bind/pri/JONES b/bind/pri/JONES
index 1e6af1c..412a80b 100644
--- a/bind/pri/JONES
+++ b/bind/pri/JONES
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
 
-* CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *
diff --git a/bind/pri/JONES-www b/bind/pri/JONES-www
index 5e105e8..235b879 100644
--- a/bind/pri/JONES-www
+++ b/bind/pri/JONES-www
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
 
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/pri/JONES-www+source b/bind/pri/JONES-www+source
index 7a0d15e..836b24b 100644
--- a/bind/pri/JONES-www+source
+++ b/bind/pri/JONES-www+source
@@ -7,5 +7,5 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
 
-source CNAME xayide.jones.dk.
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/pri/JONES-www+source+admin+media b/bind/pri/JONES-www+source+admin+media
index 2960745..1d02708 100644
--- a/bind/pri/JONES-www+source+admin+media
+++ b/bind/pri/JONES-www+source+admin+media
@@ -7,7 +7,7 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
 
-admin CNAME xayide.jones.dk.
-media CNAME morla.jones.dk.
-source CNAME xayide.jones.dk.
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud media
diff --git a/bind/pri/JONES-www-nomail b/bind/pri/JONES-www-nomail
index 56d2f37..23b57e4 100644
--- a/bind/pri/JONES-www-nomail
+++ b/bind/pri/JONES-www-nomail
@@ -7,4 +7,4 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
 
-www CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 85048de..1edd17c 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -199,163 +199,116 @@ msg CNAME coreander
 *.msg CNAME coreander
 
 ; Public local services (use CNAME)
-*.mail CNAME xayide
-www CNAME xayide
-*.www CNAME xayide
-ftp CNAME xayide
-abrao CNAME xayide
-*.abrao CNAME xayide
-tasekbera CNAME xayide ; "Owner=Chrois" "Desc=Tourism in Koala Lumpur"
-demo CNAME xayide ; "Desc=jones.dk temporary demo site"
-*.demo CNAME xayide ; "Desc=jones.dk temporary demo site"
-bund CNAME xayide ; "Owner=Esben Stephansen" "Desc=Bundproductions"
-*.bund CNAME xayide
-ledger CNAME xayide
-afp CNAME xayide
-anja CNAME xayide
-ane CNAME xayide
-ascanius CNAME xayide
-automata CNAME xayide
-blaagaard CNAME xayide
-bos CNAME xayide
-cgi CNAME xayide
-chat CNAME xayide
-*.chat CNAME xayide
-conference CNAME xayide
-*.conference CNAME xayide
-msn CNAME xayide
-*.msn CNAME xayide
-irc CNAME xayide
-computersmerter CNAME xayide
-christen CNAME xayide
-deb CNAME morla
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *.mail
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ane
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME anja
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ascanius
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME automata
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME blaagaard
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME bos
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME cgi
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME christen
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME computersmerter
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME craignative ; "Owner=Jacob Valdemar"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME diskurs
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME dive
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME felicia
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME floppyfw
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME forum
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ftp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME gift-economy
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME helbak
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME iki
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME irc
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME kalender
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME kimkim
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ledger
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME leif
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME lichtraum
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME lyrik
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME morgan
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME nicolai
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME o2
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME ordet
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME peronard
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME peter
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME search
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME soundfactory
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME stats
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME sundbykajak
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME swing
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME tasekbera ; "Owner=Chrois" "Desc=Tourism in Koala Lumpur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME toolbox
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME vestergror
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME wap
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME webmail
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME webtools
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME workingday
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME xn--gavekonomi-3cb
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME yuffies
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X abrao
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X admin
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X boot
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X bund ; "Owner=Esben Stephansen" "Desc=Bundproductions"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X chat
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X china
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X conception ; "Owner=Jasper"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X conference
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X cyberhus
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X danmark
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X data
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X dbk ; "Desc=Den Blaa Kanin"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X demo ; "Desc=jones.dk temporary demo site"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X fest
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X files
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X firdaus
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X foto ; "Owner=Stine" "Desc=Nicaragua tur-retur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X helloearth
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X horde
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ibsen
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ie ; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X imp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X jgh ; "Owner=Jacob Gorm"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X lux ; "Owner=Christen Stephansen"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X malene ; "Desc=Malenes foto-galleri"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X mirrors
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X msn
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X munkefoto
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X munkefotos
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X nande
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X otto
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X phone
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X photo ; "Owner=Stine" "Desc=Nicaragua tur-retur"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X ronald ; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X samsul
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X sayed
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X shell
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X siri
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X steiner
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X surya
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X teatroglimt ; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X trekroner ; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X users
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X visensvenner
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X wall
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud deb
 debian CNAME coreander
 *.debian CNAME coreander
-diskurs CNAME xayide
-dive CNAME xayide
-felicia CNAME xayide
-fest CNAME xayide
-*.fest CNAME xayide
-floppyfw CNAME xayide
-xn--gavekonomi-3cb CNAME xayide
-gift-economy CNAME xayide
-helbak CNAME xayide
-iki CNAME xayide
-kimkim CNAME xayide
-leif CNAME xayide
-lichtraum CNAME xayide
-lyrik CNAME xayide
-morgan CNAME xayide
-nicolai CNAME xayide
-o2 CNAME xayide
-ordet CNAME xayide
-peronard CNAME xayide
-peter CNAME xayide
-search CNAME xayide
-siri CNAME xayide
-*.siri CNAME xayide
 asbjorn CNAME coreander
 *.asbjorn CNAME coreander
-soundfactory CNAME xayide
-stats CNAME xayide
-sundbykajak CNAME xayide
-swing CNAME xayide
-vestergror CNAME xayide
-wap CNAME xayide
-workingday CNAME xayide
-yuffies CNAME xayide
-china CNAME xayide
-*.china CNAME xayide
-ibsen CNAME xayide
-*.ibsen CNAME xayide
 cvs CNAME coreander
 svn CNAME coreander
-teatroglimt CNAME xayide ; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
-*.teatroglimt CNAME xayide
-malene CNAME xayide ; "Desc=Malenes foto-galleri"
-*.malene CNAME xayide
-webmail CNAME xayide
-webtools CNAME xayide ; "Desc=Webtools"
-forum CNAME xayide
-kalender CNAME xayide
-toolbox CNAME xayide
 img CNAME coreander
 *.img CNAME coreander
-imp CNAME xayide
-*.imp CNAME xayide
-horde CNAME xayide
-*.horde CNAME xayide
-danmark CNAME xayide
-*.danmark CNAME xayide
-data CNAME xayide
-*.data CNAME xayide
-dbk CNAME xayide ; "Desc=Den Blaa Kanin"
-*.dbk CNAME xayide
-nande CNAME xayide ; "Desc=Nande"
-*.nande CNAME xayide
-foto CNAME xayide ; "Owner=Stine" "Desc=Nicaragua tur-retur"
-*.foto CNAME xayide
-phone CNAME xayide
-*.phone CNAME xayide
-photo CNAME xayide
-*.photo CNAME xayide
-visensvenner CNAME xayide
-*.visensvenner CNAME xayide
-ronald CNAME xayide ; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
-*.ronald CNAME xayide
-jgh CNAME xayide ; "Owner=Jacob Gorm"
-*.jgh CNAME xayide
-lux CNAME xayide ; "Owner=Christen Stephansen"
-*.lux CNAME xayide
-conception CNAME xayide ; "Owner=Jasper"
-*.conception CNAME xayide
-ie CNAME xayide ; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
-*.ie CNAME xayide
-craignative CNAME xayide ; "Owner=Jacob Valdemar"
 wiki CNAME coreander
 *.wiki CNAME coreander
-trekroner CNAME xayide ; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
-*.trekroner CNAME xayide
-steiner CNAME xayide
-*.steiner CNAME xayide
-admin CNAME xayide
-*.admin CNAME xayide
-firdaus CNAME xayide
-*.firdaus CNAME xayide
-munkefoto CNAME xayide
-*.munkefoto CNAME xayide
-munkefotos CNAME xayide
-*.munkefotos CNAME xayide
-mirrors CNAME xayide
-*.mirrors CNAME xayide
-files CNAME xayide
-*.files CNAME xayide
 log CNAME slamuf
 *.log CNAME slamuf
 backup CNAME slamuf
 *.backup CNAME slamuf
-shell CNAME xayide
-*.shell CNAME xayide
-otto CNAME xayide
-*.otto CNAME xayide
-source CNAME xayide
-*.source CNAME xayide
-samsul CNAME xayide
-*.samsul CNAME xayide
-sayed CNAME xayide
-*.sayed CNAME xayide
-surya CNAME xayide
-*.surya CNAME xayide
-users CNAME xayide
-*.users CNAME xayide
-boot CNAME xayide
-*.boot CNAME xayide
-helloearth CNAME xayide
-*.helloearth CNAME xayide
-cyberhus CNAME xayide
-*.cyberhus CNAME xayide
-wall CNAME xayide
-*.wall CNAME xayide
 
 ; Private zone roots, mailhubs and non-CNAME services (use A)
 
diff --git a/bind/pri/kassandra-production.dk b/bind/pri/kassandra-production.dk
index f334b4d..55c323f 100644
--- a/bind/pri/kassandra-production.dk
+++ b/bind/pri/kassandra-production.dk
@@ -7,7 +7,6 @@ $INCLUDE /etc/local-JONES.DK/bind/skel/NS
 $INCLUDE /etc/local-JONES.DK/bind/skel/A
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
 
-www CNAME xayide.jones.dk.
-
-omni CNAME xayide.jones.dk.
-www.omni CNAME xayide.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME omni
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www.omni