From 7806c6b9e9e8a035f9ad3858bf929fb0cd48ef86 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Sun, 22 Apr 2018 12:07:42 +0200 Subject: [PATCH] DNS and DHCP updates --- roles/dhcpd/templates/dhcp/dhcpd.conf.j2 | 6 ++++++ roles/dns/tasks/main.yml | 6 +++--- roles/dns/templates/bind/23.172.in-addr.arpa.zone.j2 | 7 ++++--- roles/dns/templates/bind/binary.kitchen.zone.j2 | 7 ++++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 index 74652bc..76ad923 100644 --- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 @@ -52,6 +52,7 @@ subnet 172.23.1.0 netmask 255.255.255.0 {} # Services subnet 172.23.2.0 netmask 255.255.255.0 { + allow bootp; option routers 172.23.2.1; } @@ -140,6 +141,11 @@ host spiegelei { fixed-address spiegelei.binary.kitchen; } +host obatzda { + hardware ethernet ec:9a:74:35:35:cf; + fixed-address obatzda.binary.kitchen; +} + # VoIP Phones diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml index 8a4ed36..578f261 100644 --- a/roles/dns/tasks/main.yml +++ b/roles/dns/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install powerdns - apt: name={{item}} default_release=jessie-backports state=latest + apt: name={{ item }} with_items: - pdns-server - pdns-recursor @@ -10,7 +10,7 @@ file: path=/etc/powerdns/bind/ state=directory - name: Configure powerdns - template: src={{item}}.j2 dest=/etc/powerdns/{{item}} + template: src={{ item }}.j2 dest=/etc/powerdns/{{ item }} notify: Restart powerdns with_items: - pdns.conf @@ -20,7 +20,7 @@ - bind/binary.kitchen.zone - name: Start the powerdns services - service: name={{item}} state=started enabled=yes + service: name={{ item }} state=started enabled=yes with_items: - pdns - pdns-recursor 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 b06acb1..b5d9fe4 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. ( - 2018020301; serial + 2018041601; serial 1d; refresh 2h; retry 4w; expire @@ -42,6 +42,7 @@ $TTL 1h ; default time-to-live 60.2 IN PTR punsch.binary.kitchen. 62.2 IN PTR bowle.binary.kitchen. 91.2 IN PTR spiegelei.binary.kitchen. +92.2 IN PTR obatzda.binary.kitchen. ; Clients 1.3 IN PTR v2303.core.binary.kitchen. $GENERATE 10-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. @@ -53,8 +54,8 @@ $GENERATE 10-240 $.3 IN PTR dhcp-${0,3,d}-03.binary.kitchen. $GENERATE 10-240 $.4 IN PTR dhcp-${0,3,d}-04.binary.kitchen. ; Management RZ 23.8 IN PTR cernunnos.binary.kitchen. -61.8 IN PTR ruben.binary.kitchen. -81.8 IN PTR ruben-bmc.binary.kitchen. +60.8 IN PTR ruben.binary.kitchen. +80.8 IN PTR ruben-bmc.binary.kitchen. 254.8 IN PTR switch0.erx-rz.binary.kitchen. ; VPN RZ 1.10 IN PTR vtun0.erx-rz.binary.kitchen. diff --git a/roles/dns/templates/bind/binary.kitchen.zone.j2 b/roles/dns/templates/bind/binary.kitchen.zone.j2 index 37f7fac..b5439ce 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. ( - 2018020301; serial + 2018041601; serial 1d; refresh 2h; retry 4w; expire @@ -56,6 +56,7 @@ cashdesk IN A 172.23.2.44 punsch IN A 172.23.2.60 bowle IN A 172.23.2.62 spiegelei IN A 172.23.2.91 +obatzda IN A 172.23.2.92 ; Clients v2303.core IN A 172.23.3.1 $GENERATE 1-240 dhcp-${0,3,d}-03 IN A 172.23.3.$ @@ -67,8 +68,8 @@ pizza.mqtt IN A 172.23.4.6 $GENERATE 1-240 dhcp-${0,3,d}-04 IN A 172.23.4.$ ; Management RZ cernunnos IN A 172.23.8.23 -ruben IN A 172.23.8.61 -ruben-bmc IN A 172.23.8.81 +ruben IN A 172.23.8.60 +ruben-bmc IN A 172.23.8.80 switch0.erx-rz IN A 172.23.8.254 ; VPN RZ $GENERATE 2-254 vpn-${0,3,d}-10 IN A 172.23.10.$