Merge pull request #77 from bogdanr/master

Made formating identical with Debian so we modify minimum lines
This commit is contained in:
Niels Abspoel 2017-07-19 21:19:02 +02:00 committed by GitHub
commit d49a3dd29a
3 changed files with 14 additions and 15 deletions

View file

@ -7,6 +7,4 @@
RESOLVCONF=no RESOLVCONF=no
# startup options for the server # startup options for the server
# force ipv4 only
OPTIONS="{{ param|join(' ') }}" OPTIONS="{{ param|join(' ') }}"

View file

@ -1,7 +1,7 @@
// This is the primary configuration file for the BIND DNS server named. // This is the primary configuration file for the BIND DNS server named.
// //
// Please read /usr/share/doc/bind9/README.Debian.gz for information on the // Please read /usr/share/doc/bind9/README.Debian.gz for information on the
// structure of BIND configuration files in Debian, *BEFORE* you customize // structure of BIND configuration files in Debian, *BEFORE* you customize
// this configuration file. // this configuration file.
// //
// If you are just adding zones, please do that in /etc/bind/named.conf.local // If you are just adding zones, please do that in /etc/bind/named.conf.local
@ -17,4 +17,3 @@ include "{{ map.default_zones_config }}";
{%- for incl in salt['pillar.get']('bind:config:includes', []) %} {%- for incl in salt['pillar.get']('bind:config:includes', []) %}
include "{{ incl }}"; include "{{ incl }}";
{% endfor %} {% endfor %}

View file

@ -1,28 +1,30 @@
// prime the server with knowledge of the root servers // prime the server with knowledge of the root servers
zone "." { zone "." {
type hint; type hint;
file "/etc/bind/db.root"; file "/etc/bind/db.root";
}; };
// be authoritative for the localhost forward and reverse zones, and for // be authoritative for the localhost forward and reverse zones, and for
// broadcast zones as per RFC 1912 // broadcast zones as per RFC 1912
zone "localhost" { zone "localhost" {
type master; type master;
file "/etc/bind/db.local"; file "/etc/bind/db.local";
}; };
zone "127.in-addr.arpa" { zone "127.in-addr.arpa" {
type master; type master;
file "/etc/bind/db.127"; file "/etc/bind/db.127";
}; };
zone "0.in-addr.arpa" { zone "0.in-addr.arpa" {
type master; type master;
file "/etc/bind/db.0"; file "/etc/bind/db.0";
}; };
zone "255.in-addr.arpa" { zone "255.in-addr.arpa" {
type master; type master;
file "/etc/bind/db.255"; file "/etc/bind/db.255";
}; };