From 12742d569d4406ddf254286dbc825333f4984bd0 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Fri, 17 Feb 2017 21:16:09 +0100 Subject: [PATCH] IP/DNS changes. --- roles/dhcpd/templates/dhcp/dhcpd.conf.j2 | 2 +- .../bind/23.172.in-addr.arpa.zone.j2 | 15 ++++++------ .../dns/templates/bind/binary.kitchen.zone.j2 | 24 +++++++++++-------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 index 2c0f300..8063df7 100644 --- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 @@ -52,7 +52,7 @@ subnet 172.23.1.0 netmask 255.255.255.0 {} # Services subnet 172.23.2.0 netmask 255.255.255.0 { - option routers 172.23.2.254; + option routers 172.23.2.1; } # Members 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 e799422..c890948 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. ( - 2017012302; serial + 2017020901; serial 1d; refresh 2h; retry 4w; expire @@ -9,18 +9,19 @@ $TTL 1h ; default time-to-live ) IN NS ns.binary.kitchen. ; Management +1.1 IN PTR v2301.core.binary.kitchen. 11.1 IN PTR apcusv.binary.kitchen. 41.1 IN PTR ap01.binary.kitchen. 42.1 IN PTR ap02.binary.kitchen. 61.1 IN PTR kraut.binary.kitchen. 81.1 IN PTR kraut-bmc.binary.kitchen. -254.1 IN PTR v2301.core.binary.kitchen. ; Services -1.2 IN PTR aveta.binary.kitchen. +1.2 IN PTR v2302.core.binary.kitchen. +2.2 IN PTR ns.binary.kitchen. 3.2 IN PTR bacon.binary.kitchen. +4.2 IN PTR aveta.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. 12.2 IN PTR lock.binary.kitchen. 13.2 IN PTR matrix.binary.kitchen. @@ -28,12 +29,12 @@ $TTL 1h ; default time-to-live 44.2 IN PTR cashdesk.binary.kitchen. 60.2 IN PTR punsch.binary.kitchen. 91.2 IN PTR spiegelei.binary.kitchen. -254.2 IN PTR v2302.core.binary.kitchen. -; Members +; Clients 1.3 IN PTR v2303.core.binary.kitchen. $GENERATE 10-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. -; Guests +; MQTT 1.4 IN PTR v2304.core.binary.kitchen. +5.4 IN PTR sushi.mqtt.binary.kitchen. $GENERATE 10-240 $.4 IN PTR dhcp-${0,3,d}-04.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 4f18e68..31532ab 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. ( - 2017012302; serial + 2017020901; serial 1d; refresh 2h; retry 4w; expire @@ -12,26 +12,30 @@ $TTL 1h ; default time-to-live IN A 213.166.246.4 www IN A 213.166.246.4 ; Aliases -ldap IN A 172.23.2.1 +ldap IN A 172.23.2.3 +ldap IN A 172.23.2.4 ldap IN A 213.166.246.2 -ldap1 IN A 172.23.2.1 -ldap2 IN A 213.166.246.2 +ldap1 IN A 172.23.2.3 +ldap2 IN A 172.23.2.4 ldapm IN A 213.166.246.2 librenms IN A 172.23.2.6 racktables IN A 172.23.2.6 +radius1 IN A 172.23.2.3 +radius2 IN A 172.23.2.4 ; Management +v2301.core IN A 172.23.1.1 apcusv IN A 172.23.1.11 ap01 IN A 172.23.1.41 ap02 IN A 172.23.1.42 kraut IN A 172.23.1.61 kraut-bmc IN A 172.23.1.81 -v2301.core IN A 172.23.1.254 ; Services -aveta IN A 172.23.2.1 +v2302.core IN A 172.23.2.1 +ns IN A 172.23.2.2 bacon IN A 172.23.2.3 +aveta 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 lock IN A 172.23.2.12 matrix IN A 172.23.2.13 @@ -39,12 +43,12 @@ sushi IN A 172.23.2.35 cashdesk IN A 172.23.2.44 punsch IN A 172.23.2.60 spiegelei IN A 172.23.2.91 -v2302.core IN A 172.23.2.254 -; Members +; Clients v2303.core IN A 172.23.3.1 $GENERATE 1-240 dhcp-${0,3,d}-03 IN A 172.23.3.$ -; Guests +; MQTT v2304.core IN A 172.23.4.1 +sushi.mqtt IN A 172.23.4.5 $GENERATE 1-240 dhcp-${0,3,d}-04 IN A 172.23.4.$ ; Management RZ cernunnos IN A 172.23.8.23