summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-01-19 00:04:35 +0100
committerJonas Smedegaard <dr@jones.dk>2017-01-19 00:04:35 +0100
commit532b71affb40c3270d2aa7e958e96048f27bbf5b (patch)
tree922c7c1217901fbb30964b6e24d88ad524b1baac
parent428ca099683c3379141a0d9939a551ec24ba01b6 (diff)
Refactor BIND zone files: include skeleton snippets.
-rw-r--r--bind/fake-222/JONES10
-rw-r--r--bind/fake-222/JONES-mailonly8
-rw-r--r--bind/fake-222/JONES-www10
-rw-r--r--bind/fake-222/JONES-www+source10
-rw-r--r--bind/fake-222/JONES-www+source+admin+media10
-rw-r--r--bind/fake-222/JONES-www-nomail6
-rw-r--r--bind/fake-222/OFF4
-rw-r--r--bind/fake-222/jones.dk173
-rw-r--r--bind/pri/JONES15
-rw-r--r--bind/pri/JONES-mailonly13
-rw-r--r--bind/pri/JONES-www15
-rw-r--r--bind/pri/JONES-www+source15
-rw-r--r--bind/pri/JONES-www+source+admin+media15
-rw-r--r--bind/pri/JONES-www-nomail11
-rw-r--r--bind/pri/OFF9
-rw-r--r--bind/pri/jones.dk205
-rw-r--r--bind/pri/xpositionreverse.org23
-rw-r--r--bind/skel/A3
-rw-r--r--bind/skel/A-2221
-rw-r--r--bind/skel/LOC2
-rw-r--r--bind/skel/MX6
-rw-r--r--bind/skel/MX-A3
-rw-r--r--bind/skel/MX-avoid3
-rw-r--r--bind/skel/NS4
24 files changed, 212 insertions, 362 deletions
diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index cf0054e..1ab977b 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -1,14 +1,8 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
* CNAME xayide.jones.dk.
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
diff --git a/bind/fake-222/JONES-mailonly b/bind/fake-222/JONES-mailonly
index 7f40d26..213f252 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -1,11 +1,5 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NS localhost.
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
diff --git a/bind/fake-222/JONES-www b/bind/fake-222/JONES-www
index 537fe80..431d3a7 100644
--- a/bind/fake-222/JONES-www
+++ b/bind/fake-222/JONES-www
@@ -1,14 +1,8 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
www CNAME xayide.jones.dk.
diff --git a/bind/fake-222/JONES-www+source b/bind/fake-222/JONES-www+source
index da97131..5fc8197 100644
--- a/bind/fake-222/JONES-www+source
+++ b/bind/fake-222/JONES-www+source
@@ -1,15 +1,9 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
source CNAME xayide.jones.dk.
www CNAME xayide.jones.dk.
diff --git a/bind/fake-222/JONES-www+source+admin+media b/bind/fake-222/JONES-www+source+admin+media
index 1cbcc49..ceebb6b 100644
--- a/bind/fake-222/JONES-www+source+admin+media
+++ b/bind/fake-222/JONES-www+source+admin+media
@@ -1,15 +1,9 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
admin CNAME xayide.jones.dk.
media CNAME morla.jones.dk.
diff --git a/bind/fake-222/JONES-www-nomail b/bind/fake-222/JONES-www-nomail
index aeb07e8..3fe46d4 100644
--- a/bind/fake-222/JONES-www-nomail
+++ b/bind/fake-222/JONES-www-nomail
@@ -1,10 +1,8 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
www CNAME xayide.jones.dk.
diff --git a/bind/fake-222/OFF b/bind/fake-222/OFF
index 57e9571..471ce7c 100644
--- a/bind/fake-222/OFF
+++ b/bind/fake-222/OFF
@@ -1,7 +1,5 @@
$TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
NS localhost.
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 8bfca9f..601c8bb 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -2,77 +2,67 @@ $TTL 1w
@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h )
; Public zone roots, mailhubs and non-CNAME services (use A)
+
NS localhost.
- A 192.168.222.250 ;188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
+$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp
NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp
- LOC 55 38 N 012 05 E 100m
-mail A 192.168.222.250 ;188.183.5.254
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
-dns A 192.168.222.250 ;188.183.5.254
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- LOC 55 38 N 012 05 E 100m
+
+$INCLUDE JONES.DK/skel/A-222 mail
+$INCLUDE JONES.DK/skel/MX-A mail
+
+$INCLUDE JONES.DK/skel/A-222 dns
+$INCLUDE JONES.DK/skel/MX-avoid dns
+
lists A 80.68.88.141
MX 10 coreander.jones.dk.
MX 50 xayide.jones.dk.
MX 50 jawa.homebase.dk.
SPF "v=spf1 mx -all"
TXT "v=spf1 mx -all"
+
+$INCLUDE JONES.DK/skel/MX-avoid gate
gate NS coreander.jones.dk.
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+
; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+$INCLUDE JONES.DK/skel/MX-avoid jawa
jawa A 94.18.231.212
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD Sempron 3200+ @ 1.80GHz" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "PTR=jawa.homebase.dk"
TXT "CNAME=062121169066.sonofon.dk"
TXT "Addr=Aarhus"
+
+$INCLUDE JONES.DK/skel/MX-avoid hamlet
hamlet A 94.18.231.213
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD E-450 @ 1.65GHz (ASUS E45M1-I)" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "Addr=Aarhus, Denmark"
+
+$INCLUDE JONES.DK/skel/MX-avoid traktor
traktor A 217.70.188.6
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-188-6.ghst.net"
TXT "Addr=Paris, France"
+
+$INCLUDE JONES.DK/skel/MX-A coreander
coreander A 80.68.88.141
- MX 0 .
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
HINFO "AMD @ 2GHz (User mode QEMU 0.12.3)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones"
TXT "ISP=jump.net.uk"
TXT "Link=100Mbit"
TXT "PTR=coreander.bitbase.dk"
TXT "Addr=London"
+
+$INCLUDE JONES.DK/skel/MX-avoid cherry
cherry A 193.106.165.64
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Pentium Dual E2180 @ 2.00GHz (Dell PowerEdge SC440)" "Debian GNU/Linux"
TXT "Owner=Lab"
; TXT "ISP=Tiscali"
@@ -80,53 +70,49 @@ cherry A 193.106.165.64
TXT "PTR=cherry.107b.dk"
; TXT "CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
; TXT "Addr=Vesterbro, Copenhagen"
+
+$INCLUDE JONES.DK/skel/MX-avoid db
db A 95.142.165.142
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5520 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Koebenhavns delebiler"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-165-142.ghst.net"
TXT "Addr=Paris, France"
+
+$INCLUDE JONES.DK/skel/MX-avoid lb
lb A 173.246.102.199
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Delebilfonden"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-102-199.ghst.net"
TXT "Addr=Baltimore, USA"
+
+$INCLUDE JONES.DK/skel/MX-avoid dbold
dbold A 77.243.52.40
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD Opteron 2384 Quad @ 2.70GHz (VMware virtual Intel 440BX)" "Debian GNU/Linux"
TXT "Owner=Koebenhavns delebiler"
TXT "ISP=nianet"
TXT "Link=100mbit"
TXT "PTR=delebil01.hosted.netic.dk"
TXT "Addr=Vesterbro, Copenhagen"
+
+$INCLUDE JONES.DK/skel/MX-avoid lxp5
lxp5 A 217.197.91.142
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Atom Z510 @ 1.10GHz" "Debian GNU/Linux"
TXT "Owner=Kurt Gramlich"
TXT "ISP=Individual Network Berlin e.V."
TXT "PTR=skolelinux.in-berlin.de"
TXT "Addr=Berlin, Germany"
+
; Public local hosts (use A)
+
+$INCLUDE JONES.DK/skel/MX-A xayide
+$INCLUDE JONES.DK/skel/LOC xayide
xayide A 192.168.222.250 ;188.183.5.254
- MX 0 .
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
HINFO "Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TYPE44 \# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
TYPE44 \# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
TXT "Desc=Application server"
@@ -134,89 +120,75 @@ xayide A 192.168.222.250 ;188.183.5.254
TXT "ISP=Unotel"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid auryn
auryn A 192.168.222.52
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Core2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+
+$INCLUDE JONES.DK/skel/MX-avoid auryn-old
auryn-old A 192.168.222.53
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+
+$INCLUDE JONES.DK/skel/MX-avoid gmork
gmork A 192.168.222.56
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Transmeta Crusoe TM5600 (Sony VAIO PCG-C1VE)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+
+$INCLUDE JONES.DK/skel/MX-avoid atreju
atreju A 192.168.222.57
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+
+$INCLUDE JONES.DK/skel/MX-avoid bastian
bastian A 192.168.222.58
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+
+$INCLUDE JONES.DK/skel/MX-avoid dharma
dharma A 192.168.222.125
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Core2 Duo P7450 @ 2.13GHz (Apple MacBook5,2)" "Debian GNU/Linux"
TXT "Owner=Siri Reiter"
+
+$INCLUDE JONES.DK/skel/MX-avoid slamuf
+$INCLUDE JONES.DK/skel/LOC slamuf
slamuf A 192.168.222.251 ;188.183.5.254; via xayide.jones.dk
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Desc=Storage server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=TDC"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid hydorn
hydorn A 46.226.111.140
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-111-140.dc2.ghst.net"
TXT "Addr=Bissen, Luxembourg"
+
+$INCLUDE JONES.DK/skel/MX-avoid XXX
; A 192.168.222.248
-; MX 0 .
-; SPF "v=spf1 -all"
-; TXT "v=spf1 -all"
; HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
: LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
: TXT "Desc=Storage server"
: TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-: TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid hynreck
+$INCLUDE JONES.DK/skel/LOC hynreck
hynreck A 192.168.222.249
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
TXT "Desc=Application server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid cairon
cairon A 192.168.222.253 ; 188.183.5.254 ; via xayide.jones.dk
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel IXP420 B0 @ 266MHz (Linksys NSLU2)" "Debian GNU/Linux"
LOC 55 38 N 012 05 E 100m
TXT "Desc=Kerberos KDC"
@@ -225,31 +197,26 @@ cairon A 192.168.222.253 ; 188.183.5.254 ; via xayide.jones.dk
TXT "Link=ADSL"
TXT "CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
TXT "Addr=Mogenstrup, Regstrup"
+
+$INCLUDE JONES.DK/skel/MX-avoid hykrion
+$INCLUDE JONES.DK/skel/LOC hykrion
hykrion A 192.168.222.254
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Allwinner Dual A20 @ 1GHz (OLimex OLinuXino LIME2)" "Debian GNU/Linux"
- LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
TXT "Desc=Application server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid perilin
+$INCLUDE JONES.DK/skel/LOC perilin
perilin A 192.168.222.1 ;188.183.5.254; via xayide.jones.dk
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Desc=Gateway"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=Unotel"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid morla
morla A 163.172.142.110
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
TXT "Desc=Server"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
@@ -260,10 +227,9 @@ morla A 163.172.142.110
; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
*.lists CNAME lists
+
+$INCLUDE JONES.DK/skel/MX-avoid *.auryn
*.auryn A 192.168.0.103
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
; Public CNAME-mapped PTR records
@@ -279,7 +245,6 @@ morla A 163.172.142.110
;_kerberos._udp SRV 0 0 88 cairon
; SRV 0 0 88 xayide
;_ldap._tcp SRV 0 0 389 xayide
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
event CNAME xayide
*.event CNAME xayide
_caldavs._tcp.event SRV 0 0 443 xayide
diff --git a/bind/pri/JONES b/bind/pri/JONES
index fa5437f..bdbe01e 100644
--- a/bind/pri/JONES
+++ b/bind/pri/JONES
@@ -3,17 +3,8 @@ $TTL 1h
2016042801
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
+$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.
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
diff --git a/bind/pri/JONES-mailonly b/bind/pri/JONES-mailonly
index 357db59..977254a 100644
--- a/bind/pri/JONES-mailonly
+++ b/bind/pri/JONES-mailonly
@@ -3,14 +3,5 @@ $TTL 1h
2016042801
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
+$INCLUDE /etc/local-JONES.DK/bind/skel/NS
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX
diff --git a/bind/pri/JONES-www b/bind/pri/JONES-www
index dba1b17..7aa32bf 100644
--- a/bind/pri/JONES-www
+++ b/bind/pri/JONES-www
@@ -3,17 +3,8 @@ $TTL 1h
2016101301
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
+$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.
diff --git a/bind/pri/JONES-www+source b/bind/pri/JONES-www+source
index 379263d..08fcbf9 100644
--- a/bind/pri/JONES-www+source
+++ b/bind/pri/JONES-www+source
@@ -3,18 +3,9 @@ $TTL 1h
2016101301
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
+$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.
diff --git a/bind/pri/JONES-www+source+admin+media b/bind/pri/JONES-www+source+admin+media
index 3b4a26f..94b4e3e 100644
--- a/bind/pri/JONES-www+source+admin+media
+++ b/bind/pri/JONES-www+source+admin+media
@@ -3,18 +3,9 @@ $TTL 1h
2016101301
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
-
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
+$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.
diff --git a/bind/pri/JONES-www-nomail b/bind/pri/JONES-www-nomail
index 60a5a69..78b0c66 100644
--- a/bind/pri/JONES-www-nomail
+++ b/bind/pri/JONES-www-nomail
@@ -3,13 +3,8 @@ $TTL 1h
2016042801
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+$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.
diff --git a/bind/pri/OFF b/bind/pri/OFF
index 4168da0..f77624a 100644
--- a/bind/pri/OFF
+++ b/bind/pri/OFF
@@ -3,10 +3,5 @@ $TTL 3600
2016042801
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+$INCLUDE /etc/local-JONES.DK/bind/skel/NS
+$INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index f8b4530..7afa7a1 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -1,86 +1,74 @@
$TTL 1h
@ IN SOA dns.jones.dk. dr.jones.dk. (
- 2016123001
+ 2016123017
1h 30m 1w 1h )
+
; Public zone roots, mailhubs and non-CNAME services (use A)
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
- A 188.183.5.254
- MX 5 xayide.jones.dk.
- MX 10 perilin.jones.dk.
- MX 50 jawa.homebase.dk.
- SPF "v=spf1 mx -all"
- TXT "v=spf1 mx -all"
+
+$INCLUDE JONES.DK/skel/NS
+$INCLUDE JONES.DK/skel/A
+$INCLUDE JONES.DK/skel/MX
NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp
NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp
- LOC 55 38 51.51 N 11 30 12.62 E 29m 5m
-event A 188.183.5.254
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
-mail A 188.183.5.254
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
-dns A 188.183.5.254
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- LOC 55 38 51.51 N 11 30 12.62 E 29m 5m
+
+$INCLUDE JONES.DK/skel/A event
+$INCLUDE JONES.DK/skel/MX-avoid event
+
+$INCLUDE JONES.DK/skel/A mail
+$INCLUDE JONES.DK/skel/MX-A mail
+
+$INCLUDE JONES.DK/skel/A dns
+$INCLUDE JONES.DK/skel/MX-avoid dns
+
lists A 80.68.88.141
MX 10 coreander.jones.dk.
MX 50 xayide.jones.dk.
MX 50 jawa.homebase.dk.
SPF "v=spf1 mx -all"
TXT "v=spf1 mx -all"
+
+$INCLUDE JONES.DK/skel/MX-avoid gate
gate NS coreander.jones.dk.
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+
; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+$INCLUDE JONES.DK/skel/MX-avoid jawa
jawa A 94.18.231.212
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD Sempron 3200+ @ 1.80GHz" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "PTR=jawa.homebase.dk"
TXT "CNAME=062121169066.sonofon.dk"
TXT "Addr=Aarhus"
+
+$INCLUDE JONES.DK/skel/MX-avoid hamlet
hamlet A 94.18.231.213
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD E-450 @ 1.65GHz (ASUS E45M1-I)" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "Addr=Aarhus, Denmark"
+
+$INCLUDE JONES.DK/skel/MX-avoid traktor
traktor A 217.70.188.6
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Homebase"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-188-6.ghst.net"
TXT "Addr=Paris, France"
+
+$INCLUDE JONES.DK/skel/MX-A coreander
coreander A 80.68.88.141
- MX 0 .
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
HINFO "AMD @ 2GHz (User mode QEMU 0.12.3)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones"
TXT "ISP=jump.net.uk"
TXT "Link=100Mbit"
TXT "PTR=coreander.bitbase.dk"
TXT "Addr=London"
+
+$INCLUDE JONES.DK/skel/MX-avoid cherry
cherry A 193.106.165.64
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Pentium Dual E2180 @ 2.00GHz (Dell PowerEdge SC440)" "Debian GNU/Linux"
TXT "Owner=Lab"
; TXT "ISP=Tiscali"
@@ -88,153 +76,127 @@ cherry A 193.106.165.64
TXT "PTR=cherry.107b.dk"
; TXT "CNAME="
; TXT "Addr=Vesterbro, Copenhagen"
+
+$INCLUDE JONES.DK/skel/MX-avoid db
db A 95.142.165.142
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5520 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Delebilfonden"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-165-142.ghst.net"
TXT "Addr=Paris, France"
+
+$INCLUDE JONES.DK/skel/MX-avoid lb
lb A 173.246.102.199
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=Delebilfonden"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-102-199.ghst.net"
TXT "Addr=Baltimore, USA"
+
+$INCLUDE JONES.DK/skel/MX-avoid dbold
dbold A 77.243.52.40
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "AMD Opteron 2384 Quad @ 2.70GHz (VMware virtual Intel 440BX)" "Debian GNU/Linux"
TXT "Owner=Koebenhavns delebiler"
TXT "ISP=nianet"
TXT "Link=100mbit"
TXT "PTR=delebil01.hosted.netic.dk"
TXT "Addr=Vesterbro, Copenhagen"
+
+$INCLUDE JONES.DK/skel/MX-avoid lxp5
lxp5 A 217.197.91.142
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Atom Z510 @ 1.10GHz" "Debian GNU/Linux"
TXT "Owner=Kurt Gramlich"
TXT "ISP=Individual Network Berlin e.V."
TXT "PTR=skolelinux.in-berlin.de"
TXT "Addr=Berlin, Germany"
+
; Public local hosts (use A)
-xayide A 188.183.5.254
- MX 0 .
- SPF "v=spf1 a -all"
- TXT "v=spf1 a -all"
- HINFO "Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
+
+$INCLUDE JONES.DK/skel/A xayide
+$INCLUDE JONES.DK/skel/MX-A xayide
+xayide HINFO "Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
TXT "Desc=Application server"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=Unotel"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
-auryn MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "Intel Core 2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
+
+$INCLUDE JONES.DK/skel/MX-avoid auryn
+auryn HINFO "Intel Core 2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-auryn-old MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux"
+
+$INCLUDE JONES.DK/skel/MX-avoid auryn-old
+auryn-old HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-atreju MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
+
+$INCLUDE JONES.DK/skel/MX-avoid atreju
+atreju HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-bastian MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
+
+$INCLUDE JONES.DK/skel/MX-avoid bastian
+bastian HINFO "AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-slamuf A 188.183.5.254 ; via xayide.jones.dk
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
+
+$INCLUDE JONES.DK/skel/A slamuf
+$INCLUDE JONES.DK/skel/MX-avoid slamuf
+slamuf HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
TXT "Desc=Storage server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=Unotel"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid hydorn
hydorn A 46.226.111.140
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=gandi.net"
TXT "Link=100mbit"
TXT "PTR=xvm-111-140.dc2.ghst.net"
TXT "Addr=Bissen, Luxembourg"
-; MX 0 .
-; SPF "v=spf1 -all"
+
+;$INCLUDE JONES.DK/skel/MX-avoid XXX
+;$INCLUDE JONES.DK/skel/LOC XXX
; HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
-: LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
: TXT "Desc=Storage server"
: TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-: TXT "Addr=Oroe"
-hynreck MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
- LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
+
+$INCLUDE JONES.DK/skel/MX-avoid hynreck
+$INCLUDE JONES.DK/skel/LOC hynreck
+hynreck HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
TXT "Desc=Application server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "Addr=Oroe"
-hykrion MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex OLinuXino LIME2)" "Debian GNU/Linux"
- LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
+
+$INCLUDE JONES.DK/skel/MX-avoid hykrion
+$INCLUDE JONES.DK/skel/LOC hykrion
+hykrion HINFO "Allwinner Dual A20 @ 1GHz (OLimex OLinuXino LIME2)" "Debian GNU/Linux"
TXT "Desc=Application server"
TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "Addr=Oroe"
-;cairon A 188.183.5.254 ; via xayide.jones.dk
-; MX 0 .
-; SPF "v=spf1 -all"
-; TXT "v=spf1 -all"
-; HINFO "Intel IXP420 B0 @ 266MHz (Linksys NSLU2)" "Debian GNU/Linux"
-; LOC 55 38 N 012 05 E 100m
+
+;$INCLUDE JONES.DK/skel/A cairon
+;$INCLUDE JONES.DK/skel/MX-avoid cairon
+;cairon HINFO "Intel IXP420 B0 @ 266MHz (Linksys NSLU2)" "Debian GNU/Linux"
; TXT "Desc=Kerberos KDC"
; TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
; TXT "ISP=TDC"
; TXT "Link=ADSL"
; TXT "CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-; TXT "Addr=Mogenstrup, Regstrup"
-perilin A 188.183.5.254 ; via xayide.jones.dk
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+
+$INCLUDE JONES.DK/skel/A perilin
+$INCLUDE JONES.DK/skel/MX-avoid perilin
HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
- LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
TXT "Desc=Gateway"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
TXT "ISP=Unotel"
TXT "Link=ADSL"
TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
- TXT "Addr=Oroe"
+
+$INCLUDE JONES.DK/skel/MX-avoid morla
morla A 163.172.142.110
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
TXT "Desc=Server"
TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
@@ -247,11 +209,11 @@ morla A 163.172.142.110
*.event CNAME event
*.lists CNAME lists
*.auryn A 192.168.0.103
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+$INCLUDE JONES.DK/skel/MX-avoid *.auryn
+
; Public CNAME-mapped PTR records
+
188.183.5.254 PTR xayide
;; Public complex records
@@ -266,7 +228,6 @@ morla A 163.172.142.110
;_kerberos._udp SRV 0 0 88 cairon
; SRV 0 0 88 xayide
;_ldap._tcp SRV 0 0 389 xayide
-postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
_caldavs._tcp.event SRV 0 0 443 event
_jabber._tcp SRV 0 0 5269 xayide
_xmpp-server._tcp SRV 0 0 5269 xayide
diff --git a/bind/pri/xpositionreverse.org b/bind/pri/xpositionreverse.org
index 2501390..39b05d0 100644
--- a/bind/pri/xpositionreverse.org
+++ b/bind/pri/xpositionreverse.org
@@ -3,27 +3,18 @@ $TTL 1h
2016042801
1h 30m 1w 1h )
- NS dns.jones.dk.
- NS ns.bitbase.dk.
- NS ns.superserver.dk.
- NS ns.homebase.dk.
+$INCLUDE JONES.DK/skel/NS
+$INCLUDE JONES.DK/skel/MX-avoid
A 80.68.88.141
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+$INCLUDE JONES.DK/skel/MX-avoid aarhus
aarhus A 83.94.204.31
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+
+$INCLUDE JONES.DK/skel/MX-avoid gothenburg
gothenburg A 83.140.87.74
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
+
+$INCLUDE JONES.DK/skel/MX-avoid afv
afv A 62.242.105.84
- MX 0 .
- SPF "v=spf1 -all"
- TXT "v=spf1 -all"
* CNAME coreander.jones.dk.
diff --git a/bind/skel/A b/bind/skel/A
new file mode 100644
index 0000000..6064dba
--- /dev/null
+++ b/bind/skel/A
@@ -0,0 +1,3 @@
+@ A 188.183.5.254
+@ LOC 55 45 51.9 N 11 49 1.9 E 29m 6m
+@ TXT "Addr=Oroe"
diff --git a/bind/skel/A-222 b/bind/skel/A-222
new file mode 100644
index 0000000..678fb0f
--- /dev/null
+++ b/bind/skel/A-222
@@ -0,0 +1 @@
+@ A 192.168.222.250
diff --git a/bind/skel/LOC b/bind/skel/LOC
new file mode 100644
index 0000000..6c3474d
--- /dev/null
+++ b/bind/skel/LOC
@@ -0,0 +1,2 @@
+@ LOC 55 45 51.9 N 11 49 1.9 E 29m 6m
+@ TXT "Addr=Oroe"
diff --git a/bind/skel/MX b/bind/skel/MX
new file mode 100644
index 0000000..6a931f9
--- /dev/null
+++ b/bind/skel/MX
@@ -0,0 +1,6 @@
+@ MX 5 xayide.jones.dk.
+@ MX 10 perilin.jones.dk.
+@ MX 50 jawa.homebase.dk.
+@ SPF "v=spf1 -all"
+@ TXT "v=spf1 -all"
+postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
diff --git a/bind/skel/MX-A b/bind/skel/MX-A
new file mode 100644
index 0000000..1f6be97
--- /dev/null
+++ b/bind/skel/MX-A
@@ -0,0 +1,3 @@
+@ MX 0 .
+@ SPF "v=spf1 a -all"
+@ TXT "v=spf1 a -all"
diff --git a/bind/skel/MX-avoid b/bind/skel/MX-avoid
new file mode 100644
index 0000000..1acbe8d
--- /dev/null
+++ b/bind/skel/MX-avoid
@@ -0,0 +1,3 @@
+@ IN MX 0 .
+@ IN SPF "v=spf1 -all"
+@ IN TXT "v=spf1 -all"
diff --git a/bind/skel/NS b/bind/skel/NS
new file mode 100644
index 0000000..bcbd3aa
--- /dev/null
+++ b/bind/skel/NS
@@ -0,0 +1,4 @@
+@ NS dns.jones.dk.
+@ NS ns.bitbase.dk.
+@ NS ns.superserver.dk.
+@ NS ns.homebase.dk.