From de1a36efb16e0c96a33ec8aed87e6705dae3254a Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Fri, 30 Jul 2021 23:31:04 +0200
Subject: [PATCH] dhcpd: dns_intern: add dhcp ranged for auweg

---
 roles/dhcpd/templates/dhcp/dhcpd.conf.j2      | 35 +++++++++++++++++++
 .../bind/23.172.in-addr.arpa.zone.j2          |  5 ++-
 .../templates/bind/binary.kitchen.zone.j2     |  5 ++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
index c21ac1a..e99e5b4 100644
--- a/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcp/dhcpd.conf.j2
@@ -84,6 +84,41 @@ subnet 172.23.4.0 netmask 255.255.255.0 {
   }
 }
 
+# Management Auweg
+subnet 172.23.12.0 netmask 255.255.255.0 {
+  option routers 172.23.12.1;
+}
+
+# Services Auweg
+subnet 172.23.13.0 netmask 255.255.255.0 {
+  allow bootp;
+  option routers 172.23.13.1;
+}
+
+# Users Auweg
+subnet 172.23.14.0 netmask 255.255.255.0 {
+  option routers 172.23.3.1;
+  ddns-domainname "users.binary.kitchen";
+  option domain-search "binary.kitchen", "users.binary.kitchen";
+  pool {
+{% if dhcpd_failover == true %}
+    failover peer "failover-partner";
+{% endif %}
+    range 172.23.14.10 172.23.14.230;
+  }
+}
+
+# MQTT Auweg
+subnet 172.23.15.0 netmask 255.255.255.0 {
+  option routers 172.23.4.1;
+  pool {
+{% if dhcpd_failover == true %}
+    failover peer "failover-partner";
+{% endif %}
+    range 172.23.15.10 172.23.15.240;
+  }
+}
+
 # DDNS zones
 
 zone users.binary.kitchen {
diff --git a/roles/dns_intern/templates/bind/23.172.in-addr.arpa.zone.j2 b/roles/dns_intern/templates/bind/23.172.in-addr.arpa.zone.j2
index e454576..c4fe18a 100644
--- a/roles/dns_intern/templates/bind/23.172.in-addr.arpa.zone.j2
+++ b/roles/dns_intern/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 ns1.binary.kitchen. hostmaster.binary.kitchen. (
-					2021073002; serial
+					2021073003; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -84,6 +84,9 @@ $GENERATE 2-254 $.10		IN	PTR	vpn-${0,3,d}-10.binary.kitchen.
 ; Services Auweg
 3.12				IN	PTR	aeron.binary.kitchen.
 ; Clients Auweg
+$GENERATE 10-230 $.14		IN	PTR	dhcp-${0,3,d}-14.binary.kitchen.
+; MQTT
+$GENERATE 10-240 $.15		IN	PTR	dhcp-${0,3,d}-15.binary.kitchen.
 ; Point-to-Point
 1.96				IN	PTR	v400.erx-bk.binary.kitchen.
 2.96				IN	PTR	v400.core.binary.kitchen.
diff --git a/roles/dns_intern/templates/bind/binary.kitchen.zone.j2 b/roles/dns_intern/templates/bind/binary.kitchen.zone.j2
index 1378344..984788b 100644
--- a/roles/dns_intern/templates/bind/binary.kitchen.zone.j2
+++ b/roles/dns_intern/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 ns1.binary.kitchen. hostmaster.binary.kitchen. (
-					2021073002; serial
+					2021073003; serial
 					1d; refresh
 					2h; retry
 					4w; expire
@@ -101,6 +101,9 @@ weizen				IN	A	172.23.12.61
 ; Services Auweg
 aeron				IN	A	172.23.13.3
 ; Clients Auweg
+$GENERATE 10-230 dhcp-${0,3,d}-14	IN	A	172.23.14.$
+; MQTT Auweg
+$GENERATE 10-240 dhcp-${0,3,d}-15	IN	A	172.23.15.$
 ; VPN RZ (ER-X)
 wg0.erx-rz			IN	A	172.23.10.1
 $GENERATE 2-254 vpn-${0,3,d}-10	IN	A	172.23.10.$