Browse Source

Merge branch 'wip-network' into 'master'

bind: revert dhclient.conf.j2 changes for backward compatibility

See merge request main/infrastructure!290
keep-around/eb71bd50d91998c04088f62703ed7ca17d11dd04
Loïc Dachary 1 year ago
parent
commit
eb71bd50d9
  1. 12
      playbooks/bind/roles/dhclient/templates/dhclient.conf.j2

12
playbooks/bind/roles/dhclient/templates/dhclient.conf.j2

@ -17,10 +17,20 @@ request subnet-mask, broadcast-address, time-offset,
domain-name, domain-name-servers, domain-search, host-name,
dhcp6.name-servers, dhcp6.domain-search, dhcp6.fqdn, dhcp6.sntp-servers,
netbios-name-servers, netbios-scope, interface-mtu,
ntp-servers, routers;
ntp-servers;
supersede domain-name "{{ dns_domain }}";
supersede domain-search "{{ dns_domain }}";
supersede domain-name-servers {{ bind_server_ip_for_clients }};
#
# The following is only necessary for backward compatibility. Once all Enough
# instances have a separate dhclient_no_routers.conf for the secondary
# interface, it can be removed and routers added to the "request" line
# above. There is no drawback in keeping it this way. The only incentive
# to clean it up would be to suppress the need to explain why it is
# present in the first place and wether it is worth keeping it.
#
interface "{{ network_primary_interface }}" { also request routers; }
timeout 300;

Loading…
Cancel
Save