do not overwrite named.conf

we still overwrite named.conf.options and that is where we do our
includes. that seems to be relatively acceptable upstream as they mark
only named.conf as a conffile.

See: #1025
This commit is contained in:
Antoine Beaupré 2009-08-04 19:43:10 +00:00
parent 93dde12ee2
commit 165aa0052d
3 changed files with 1 additions and 42 deletions

1
.gitattributes vendored
View File

@ -288,7 +288,6 @@ etc/alternc/postfix-slave.cf -text
etc/alternc/postfix.cf -text
etc/alternc/templates/alternc/bureau.conf -text
etc/alternc/templates/bind/automatic.conf -text
etc/alternc/templates/bind/named.conf -text
etc/alternc/templates/bind/named.conf.options -text
etc/alternc/templates/bind/slaveip.conf -text
etc/alternc/templates/bind/templates/mx.template -text

View File

@ -1,40 +0,0 @@
// 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
// structure of BIND configuration files in Debian, *BEFORE* you customize
// this configuration file.
//
// If you are just adding zones, please do that in /etc/bind/named.conf.local
include "/etc/bind/named.conf.options";
// prime the server with knowledge of the root servers
zone "." {
type hint;
file "/etc/bind/db.root";
};
// be authoritative for the localhost forward and reverse zones, and for
// broadcast zones as per RFC 1912
zone "localhost" {
type master;
file "/etc/bind/db.local";
};
zone "127.in-addr.arpa" {
type master;
file "/etc/bind/db.127";
};
zone "0.in-addr.arpa" {
type master;
file "/etc/bind/db.0";
};
zone "255.in-addr.arpa" {
type master;
file "/etc/bind/db.255";
};
include "/etc/bind/named.conf.local";

View File

@ -43,7 +43,7 @@ CONFIG_FILES="etc/alternc/bureau.conf"
if [ -e /etc/bind/named.conf ]; then
CONFIG_FILES="$CONFIG_FILES etc/bind/templates/zone.template
etc/bind/templates/named.template etc/bind/named.conf etc/bind/named.conf.options"
etc/bind/templates/named.template etc/bind/named.conf.options"
fi
if [ -e /etc/courier/authdaemonrc ]; then
CONFIG_FILES="$CONFIG_FILES etc/courier/authdaemonrc