From 46889c110b5fe14af0ca4c92ebc7eca748000d6f Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Mon, 23 Jan 2017 18:47:24 +0100 Subject: [PATCH] Add secondary DNS/DHCP. --- hosts | 1 + .../bind/23.172.in-addr.arpa.zone.j2 | 8 ++++---- .../dns/templates/bind/binary.kitchen.zone.j2 | 19 ++++++------------- site.yml | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/hosts b/hosts index 6333712..4bd8604 100644 --- a/hosts +++ b/hosts @@ -1,5 +1,6 @@ [kitchen] bacon.binary.kitchen +aveta.binary.kitchen sulis.binary.kitchen nabia.binary.kitchen [fan-rz] diff --git a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 index 89b749b..dce3fce 100644 --- a/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 +++ b/roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN 23.172.in-addr.arpa. ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2017011601; serial + 2017012301; serial 1d; refresh 2h; retry 4w; expire @@ -18,7 +18,7 @@ $TTL 1h ; default time-to-live ; Services 1.2 IN PTR aveta.binary.kitchen. 3.2 IN PTR bacon.binary.kitchen. -4.2 IN PTR sulis.binary.kitchen. +5.2 IN PTR sulis.binary.kitchen. 6.2 IN PTR nabia.binary.kitchen. 7.2 IN PTR taranis.binary.kitchen. 11.2 IN PTR homer.binary.kitchen. @@ -30,10 +30,10 @@ $TTL 1h ; default time-to-live 91.2 IN PTR spiegelei.binary.kitchen. 254.2 IN PTR v2302.core.binary.kitchen. ; Members -$GENERATE 1-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. +$GENERATE 10-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. 254.3 IN PTR v2303.core.binary.kitchen. ; Guests -$GENERATE 1-240 $.4 IN PTR dhcp-${0,3,d}-04.binary.kitchen. +$GENERATE 10-240 $.4 IN PTR dhcp-${0,3,d}-04.binary.kitchen. 254.4 IN PTR v2304.core.binary.kitchen. ; Management RZ 23.8 IN PTR cernunnos.binary.kitchen. diff --git a/roles/dns/templates/bind/binary.kitchen.zone.j2 b/roles/dns/templates/bind/binary.kitchen.zone.j2 index 426192d..8732403 100644 --- a/roles/dns/templates/bind/binary.kitchen.zone.j2 +++ b/roles/dns/templates/bind/binary.kitchen.zone.j2 @@ -1,7 +1,7 @@ $ORIGIN binary.kitchen ; base for unqualified names $TTL 1h ; default time-to-live @ IN SOA ns.binary.kitchen. hostmaster.binary.kitchen. ( - 2017011601; serial + 2017012301; serial 1d; refresh 2h; retry 4w; expire @@ -11,18 +11,11 @@ $TTL 1h ; default time-to-live ; External IN A 213.166.246.4 www IN A 213.166.246.4 -; Freifunk -xsffr1 IN A 10.90.224.11 -xsffr2 IN A 10.90.224.12 -xsffr1-bmc IN A 10.90.224.21 -xsffr2-bmc IN A 10.90.224.22 -confluence IN A 185.53.218.134 ; Aliases ldap IN A 172.23.2.1 -ldap IN A 172.23.2.2 ldap IN A 213.166.246.2 ldap1 IN A 172.23.2.1 -ldap2 IN A 172.23.2.2 +ldap2 IN A 213.166.246.2 ldapm IN A 213.166.246.2 librenms IN A 172.23.2.6 racktables IN A 172.23.2.6 @@ -36,7 +29,7 @@ v2301.core IN A 172.23.1.254 ; Services aveta IN A 172.23.2.1 bacon IN A 172.23.2.3 -sulis IN A 172.23.2.4 +sulis IN A 172.23.2.5 nabia IN A 172.23.2.6 taranis IN A 172.23.2.7 homer IN A 172.23.2.11 @@ -48,10 +41,10 @@ punsch IN A 172.23.2.60 spiegelei IN A 172.23.2.91 v2302.core IN A 172.23.2.254 ; Members -$GENERATE 1-240 dhcp-${0,3,d}-03 IN A 172.23.3.$ +$GENERATE 1-240 dhcp-${0,3,d}-03 IN A 172.23.3.$ v2303.core IN A 172.23.3.254 ; Guests -$GENERATE 1-240 dhcp-${0,3,d}-04 IN A 172.23.4.$ +$GENERATE 1-240 dhcp-${0,3,d}-04 IN A 172.23.4.$ v2304.core IN A 172.23.4.254 ; Management RZ cernunnos IN A 172.23.8.23 @@ -59,7 +52,7 @@ ruben IN A 172.23.8.61 ruben-bmc IN A 172.23.8.81 switch0.erx-rz IN A 172.23.8.254 ; VPN RZ -$GENERATE 2-254 vpn-${0,3,d}-10 IN A 172.23.10.$ +$GENERATE 2-254 vpn-${0,3,d}-10 IN A 172.23.10.$ ; Point-to-Point v4000.rtr1 IN A 172.23.96.1 gi-1-0-48.core IN A 172.23.96.2 diff --git a/site.yml b/site.yml index 1ba4a1d..5bec24f 100644 --- a/site.yml +++ b/site.yml @@ -7,7 +7,7 @@ - ntp - name: Setup BK infrastructure server - hosts: bacon.binary.kitchen + hosts: [bacon.binary.kitchen, aveta.binary.kitchen] roles: - dns - dhcpd