Procházet zdrojové kódy

update name-resolution role

Blaine Story před 2 roky
rodič
revize
d68480b309

+ 1 - 1
roles/name-resolution/templates/dhcpd/dhcpd.conf.j2

@@ -15,7 +15,7 @@ option ms-classless-static-routes code 249 = array of integer 8;
 option rfc3442-classless-static-routes 24, 192, 168, 1, 10, 0, 0, 8, 0, 10, 0, 0, 1;
 option ms-classless-static-routes 24, 192, 168, 1, 10, 0, 0, 8, 0, 10, 0, 0, 1;
 
-subnet {{ dhcp_cidr }} netmask {{ dhcp_netmask }} {
+subnet {{ dhcp_cidr|ipaddr('network') }} netmask {{ dhcp_cidr|ipaddr('netmask') }} {
 
   option routers {{ dhcp_default_gateway }};
 

+ 1 - 3
roles/name-resolution/templates/unbound/unbound.conf.j2

@@ -236,9 +236,7 @@ server:
 	# access-control: ::1 allow
 	# access-control: ::ffff:127.0.0.1 allow
 	access-control: 127.0.0.0/8 allow
-{% for cidr in allowed_access_cidrs %}
-	access-control: {{ cidr }} allow
-{% endfor %}
+	access-control: {{ dhcp_cidr }} allow
 
 	# tag access-control with list of tags (in "" with spaces between)
 	# Clients using this access control element use localzones that