From 68f7fd5b596849297306985b1bdd443cc50f4446 Mon Sep 17 00:00:00 2001
From: chirac <chirac@camelot.auro.re>
Date: Sat, 17 Oct 2020 19:48:34 +0200
Subject: [PATCH] Isc-dhcp-server config for banni/accueil vlans

---
 group_vars/all/vars.yml                       |  3 +-
 .../templates/default/isc-dhcp-server.j2      |  2 +-
 .../templates/dhcp/regular-subnets.conf.j2    | 41 +++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 6c1d978..7a84123 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -57,7 +57,8 @@ subnet_ids:
   ap: "14{{ apartment_block_id }}"
   users_wired: "{{ apartment_block_id }}0"
   users_wifi: "{{ apartment_block_id }}1"
-
+  users_banni: "{{ apartment_block_id }}2"
+  users_accueil: "{{ apartment_block_id }}3"
 
 # Keepalived
 keepalived_password: "{{ vault_keepalived_password[apartment_block] }}"
diff --git a/roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2 b/roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2
index c7f6a53..6a7c7f7 100644
--- a/roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2
+++ b/roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2
@@ -19,6 +19,6 @@
 INTERFACESv4="ens19"
 INTERFACESv6=""
 {% else %}
-INTERFACESv4="ens19 ens20 ens21"
+INTERFACESv4="ens19 ens20 ens21 ens22 ens23"
 INTERFACESv6=""
 {% endif %}
diff --git a/roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2 b/roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2
index c18eed2..43f49fa 100644
--- a/roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2
+++ b/roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2
@@ -51,3 +51,44 @@ subnet 10.{{ subnet_ids.users_wifi }}.0.0 netmask 255.255.0.0 {
 {% endif %}
        }
 }
+
+# Banni
+subnet 10.{{ subnet_ids.users_banni }}.0.0 netmask 255.255.0.0 {
+       interface "ens22";
+       option subnet-mask 255.255.0.0;
+       option broadcast-address 10.{{ subnet_ids.users_banni }}.255.255;
+       option routers 10.{{ subnet_ids.users_banni }}.0.{{ router_ip_suffix }};
+       option domain-name "banni.{{ apartment_block_dhcp }}.auro.re";
+       option domain-search "auro.re";
+
+       option domain-name-servers 10.{{ subnet_ids.users_banni }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_banni }}.0.{{ dns_host_suffix_backup }};
+
+       pool {
+            range 10.{{ subnet_ids.users_banni }}.1.0 10.{{ subnet_ids.users_banni }}.2.255;
+
+{% if dhcp_failover is defined %}
+            failover peer "dhcp-failover";
+{% endif %}
+       }
+}
+
+
+# Accueil
+subnet 10.{{ subnet_ids.users_accueil }}.0.0 netmask 255.255.0.0 {
+       interface "ens23";
+       option subnet-mask 255.255.0.0;
+       option broadcast-address 10.{{ subnet_ids.users_accueil }}.255.255;
+       option routers 10.{{ subnet_ids.users_accueil }}.0.{{ router_ip_suffix }};
+       option domain-name "accueil.{{ apartment_block_dhcp }}.auro.re";
+       option domain-search "auro.re";
+
+       option domain-name-servers 10.{{ subnet_ids.users_accueil }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_accueil }}.0.{{ dns_host_suffix_backup }};
+
+       pool {
+            range 10.{{ subnet_ids.users_accueil }}.1.0 10.{{ subnet_ids.users_accueil }}.2.255;
+
+{% if dhcp_failover is defined %}
+            failover peer "dhcp-failover";
+{% endif %}
+       }
+}