aurore/ansible
aurore/ansible
11
2
Fork 0
Code Issues 1 Pull requests 13 Releases Wiki Activity

dhcp: remove Cloudflare from backup DNS

Browse source 
and rename variable, since these are not technically
upstream DNS servers
(unbound will ask the root servers, not these)
This commit is contained in:
Yohaï-Eliel BERREBY 2020-04-18 17:06:38 +02:00
parent 12022389c4
commit 662452065f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
group_vars/all/vars.yml
View file

@ -46,7 +46,6 @@ matrix_discord_bot_token: "{{ vault_matrix_discord_bot_token }}"
dns_host_suffix_main: 253 dns_host_suffix_main: 253
dns_host_suffix_backup: 153 dns_host_suffix_backup: 153
upstream_dns_servers: backup_dns_servers:
- "80.67.169.12" # French Data Network (FDN) (ns0.fdn.fr) - "80.67.169.12" # French Data Network (FDN) (ns0.fdn.fr)
- "1.1.1.1" # Cloudflare

6
roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
View file

@ -34,7 +34,7 @@ subnet 10.{{ subnet_ids.ap }}.0.0 netmask 255.255.0.0 {
option domain-name "borne.auro.re"; option domain-name "borne.auro.re";
option domain-search "borne.auro.re"; option domain-search "borne.auro.re";
option domain-name-servers 10.{{ subnet_ids.ap }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.ap }}.0.{{ dns_host_suffix_backup }}, {{ upstream_dns_servers|join(', ') }}; option domain-name-servers 10.{{ subnet_ids.ap }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.ap }}.0.{{ dns_host_suffix_backup }}, {{ backup_dns_servers|join(', ') }};
include "/var/local/re2o-services/dhcp/generated/dhcp.borne.auro.re.list"; include "/var/local/re2o-services/dhcp/generated/dhcp.borne.auro.re.list";
deny unknown-clients; deny unknown-clients;
@ -49,7 +49,7 @@ subnet 10.{{ subnet_ids.users_wired }}.0.0 netmask 255.255.0.0 {
option domain-name "fil.{{ apartment_block }}.auro.re"; option domain-name "fil.{{ apartment_block }}.auro.re";
option domain-search "auro.re"; option domain-search "auro.re";
option domain-name-servers 10.{{ subnet_ids.users_wired }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_wired }}.0.{{ dns_host_suffix_backup }}, {{ upstream_dns_servers|join(', ') }}; option domain-name-servers 10.{{ subnet_ids.users_wired }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_wired }}.0.{{ dns_host_suffix_backup }}, {{ backup_dns_servers|join(', ') }};
include "/var/local/re2o-services/dhcp/generated/dhcp.fil.{{ apartment_block }}.auro.re.list"; include "/var/local/re2o-services/dhcp/generated/dhcp.fil.{{ apartment_block }}.auro.re.list";
@ -66,7 +66,7 @@ subnet 10.{{ subnet_ids.users_wifi }}.0.0 netmask 255.255.0.0 {
option domain-name "wifi.{{ apartment_block }}.auro.re"; option domain-name "wifi.{{ apartment_block }}.auro.re";
option domain-search "auro.re"; option domain-search "auro.re";
option domain-name-servers 10.{{ subnet_ids.users_wifi }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_wifi }}.0.{{ dns_host_suffix_backup }}, {{ upstream_dns_servers|join(', ') }}; option domain-name-servers 10.{{ subnet_ids.users_wifi }}.0.{{ dns_host_suffix_main }}, 10.{{ subnet_ids.users_wifi }}.0.{{ dns_host_suffix_backup }}, {{ backup_dns_servers|join(', ') }};
include "/var/local/re2o-services/dhcp/generated/dhcp.wifi.{{ apartment_block }}.auro.re.list"; include "/var/local/re2o-services/dhcp/generated/dhcp.wifi.{{ apartment_block }}.auro.re.list";