summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-07-17 08:36:18 +0200
committerJonas Smedegaard <dr@jones.dk>2011-07-17 08:36:18 +0200
commit0cf784bb9ad1c7fb2888f43910bc35386e191f4d (patch)
treee3d20f55d38cab3096d316fb8842295dd34209c4
parent0a27858690d7488d8539a01d98851ffdc39f6479 (diff)
Drop artofhosting.org. Extend makvaerket.dk with lists.makvaerket.dk.
-rw-r--r--bind/named.conf.pri3
-rw-r--r--bind/pri/artofhosting.org32
-rw-r--r--bind/pri/makvaerket.dk27
3 files changed, 28 insertions, 34 deletions
diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index ae85e78..af85c93 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -15,7 +15,7 @@ zone "friis-holm.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/friis-
zone "himawari.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER"; allow-transfer { bb_slaves; }; }; // Kristin Birkeland
zone "kbhvind.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER"; allow-transfer { bb_slaves; }; }; // KE Vind A/S
zone "linuxpiloterne.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER-nomail"; allow-transfer { bb_slaves; }; }; // MacRonald
-zone "makvaerket.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER"; allow-transfer { bb_slaves; }; }; // Lasse Koefoed Nielsen
+zone "makvaerket.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/makvaerket.dk"; allow-transfer { bb_slaves; }; }; // Lasse Koefoed Nielsen
zone "public-e.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER-jonesmail"; allow-transfer { bb_slaves; }; }; // Sara Gebran
zone "ressourceoptimering.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER-jonesmail"; allow-transfer { bb_slaves; }; }; // Annika Lewis
zone "redpill.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER"; allow-transfer { bb_slaves; }; }; // Spiff
@@ -23,4 +23,3 @@ zone "scharffenberger.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/CO
zone "sirireiter.dk" { type master; file "/etc/local-BITBASE.DK/bind/pri/COREANDER"; allow-transfer { bb_slaves; }; }; // Siri Reiter
// int. ns.bitbase.dk
-zone "artofhosting.org" { type master; file "/etc/local-BITBASE.DK/bind/pri/artofhosting.org"; allow-transfer { bb_slaves; }; }; // Rowan Simonsen
diff --git a/bind/pri/artofhosting.org b/bind/pri/artofhosting.org
deleted file mode 100644
index 65e0637..0000000
--- a/bind/pri/artofhosting.org
+++ /dev/null
@@ -1,32 +0,0 @@
-$TTL 3600
-@ SOA ns.bitbase.dk. teknik.bitbase.dk. (
- 2010120801 ; serial
- 3600 ; refresh
- 1800 ; retry
- 604800 ; expire
- 3600 ) ; Negative Cache TTL
- NS ns.bitbase.dk.
- NS dns.jones.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 81.95.247.21
-www CNAME cray.novicell.dk.
-cms CNAME cray.novicell.dk.
-list A 80.68.88.141
- MX 10 mail.bitbase.dk.
- MX 50 mail.jones.dk.
- MX 50 mail.dgi-huset.dk.
- MX 50 mail.homebase.dk.
- SPF "v=spf1 mx -all"
-*.list A 80.68.88.141
- MX 0 .
- SPF "v=spf1 -all"
-testlist A 80.68.88.141
- MX 10 mail.bitbase.dk.
- MX 50 mail.jones.dk.
- MX 50 mail.dgi-huset.dk.
- MX 50 mail.homebase.dk.
- SPF "v=spf1 mx -all"
-*.testlist A 80.68.88.141
- MX 0 .
- SPF "v=spf1 -all"
diff --git a/bind/pri/makvaerket.dk b/bind/pri/makvaerket.dk
new file mode 100644
index 0000000..6c55fed
--- /dev/null
+++ b/bind/pri/makvaerket.dk
@@ -0,0 +1,27 @@
+$TTL 3600
+@ SOA ns.bitbase.dk. teknik.bitbase.dk. (
+ 2011071701 ; serial
+ 3600 ; refresh
+ 1800 ; retry
+ 604800 ; expire
+ 3600 ) ; Negative Cache TTL
+ NS ns.bitbase.dk.
+ NS dns.jones.dk.
+ NS ns.superserver.dk.
+ NS ns.homebase.dk.
+ A 80.68.88.141
+ MX 10 mail.bitbase.dk.
+ MX 50 mail.jones.dk.
+ MX 50 mail.dgi-huset.dk.
+ MX 50 mail.homebase.dk.
+ SPF "v=spf1 mx -all"
+postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB"
+lists MX 10 mail.bitbase.dk.
+ MX 50 mail.jones.dk.
+ MX 50 mail.dgi-huset.dk.
+ MX 50 mail.homebase.dk.
+ SPF "v=spf1 mx -all"
+postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB"
+* A 80.68.88.141
+ MX 0 .
+ SPF "v=spf1 -all"