diff --git a/roles/bind-recursive/tasks/main.yml b/roles/bind-recursive/tasks/main.yml index e45f12c2..126a3f33 100644 --- a/roles/bind-recursive/tasks/main.yml +++ b/roles/bind-recursive/tasks/main.yml @@ -15,8 +15,7 @@ loop: - named.conf - named.conf.acl - # - named.conf.options + - named.conf.options - named.conf.local - named.conf.default-zones - - db.infra notify: Reload bind9 diff --git a/roles/bind-recursive/templates/bind/db.infra.j2 b/roles/bind-recursive/templates/bind/db.infra.j2 deleted file mode 100644 index 7f2a93a9..00000000 --- a/roles/bind-recursive/templates/bind/db.infra.j2 +++ /dev/null @@ -1,24 +0,0 @@ -{{ ansible_header | comment(decoration='; ') }} - -$TTL 0 - -@ IN SOA silice.crans.org root.crans.org ( - 0 ; serial - 3600 ; refresh (1hr) - 1800 ; retry (30mn) - 604800 ; expire (7dy) - 0 ; TTL (0s) - ) - -@ IN NS passerelle.infra.crans.org -passerelle.infra.crans.org IN A {{ (query('ldap', 'ip', 'passerelle', 'infra') | ansible.utils.ipv4)[0] }} - -* IN CNAME crans.org -*.org IN CNAME crans.org -*.fr IN CNAME crans.org -*.com IN CNAME crans.org - -intranet.crans.org IN A 172.16.32.156 ; (query('ldap', 'ip', 'intranet', 'infra') | ansible.utils.ipv4)[0] -intranet.infra.crans.org IN A 172.16.32.156 - -unifi.infra.crans.org IN A {{ (query('ldap', 'ip', 'unifi', 'infra') | ansible.utils.ipv4)[0] }} diff --git a/roles/bind-recursive/templates/bind/named.conf.acl.j2 b/roles/bind-recursive/templates/bind/named.conf.acl.j2 index 25f1ec43..5ae886c7 100644 --- a/roles/bind-recursive/templates/bind/named.conf.acl.j2 +++ b/roles/bind-recursive/templates/bind/named.conf.acl.j2 @@ -15,17 +15,7 @@ acl "adm" { fd00:0:0:{{ query('ldap', 'vlanid', 'adm') }}::/64; }; -acl "infra" { - {{ query('ldap', 'network', 'infra') }}; - fd00:0:0:{{ query('ldap', 'vlanid', 'infra') }}::/64; -}; - acl "adh" { {{ query('ldap', 'network', 'adh') }}; 2a0c:700:{{ query('ldap', 'vlanid', 'adh') }}::/48; }; - -acl "adh-nat" { - {{ query('ldap', 'network', 'adh-nat') }}; - 2a0c:700:{{ query('ldap', 'vlanid', 'adh-nat') }}::/48; -}; diff --git a/roles/bind-recursive/templates/bind/named.conf.local.j2 b/roles/bind-recursive/templates/bind/named.conf.local.j2 index 101fade7..aed55bb2 100644 --- a/roles/bind-recursive/templates/bind/named.conf.local.j2 +++ b/roles/bind-recursive/templates/bind/named.conf.local.j2 @@ -3,13 +3,3 @@ // Consider adding the 1918 zones here, if they are not used in your // organization //include "/etc/bind/zones.rfc1918"; - -view "infra" { - match-clients { infra; }; - recursion no; - - zone "." { - type master; - file "/etc/bind/db.infra"; - }; -};