diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-06-18 12:59:42 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-06-18 12:59:42 +0000 |
| commit | 4f8abb1e839edc139cdaaf8afc367134032a106b (patch) | |
| tree | e0b31045bdb8150572201cdeb7065d05b5efdbfe | |
| parent | b312fa5c8ec58aad65aaff4200ee4060dd4013de (diff) | |
| download | bind-4f8abb1e839edc139cdaaf8afc367134032a106b.tar.gz bind-4f8abb1e839edc139cdaaf8afc367134032a106b.tar.xz bind-4f8abb1e839edc139cdaaf8afc367134032a106b.zip | |
- major changes in default caching-nameserver configuration - it couldbind-9_4_1-6_fc7
satisfy RFCs now (#243565)
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | bind.spec | 63 | ||||
| -rw-r--r-- | named.broadcast | 8 | ||||
| -rw-r--r-- | named.caching-nameserver.conf | 30 | ||||
| -rw-r--r-- | named.ip6.local | 9 | ||||
| -rw-r--r-- | named.local | 9 | ||||
| -rw-r--r-- | named.rfc1912.zones | 49 | ||||
| -rw-r--r-- | named.rfc1912.zones.sample | 40 | ||||
| -rw-r--r-- | named.root.hints | 15 | ||||
| -rw-r--r-- | named.zero | 8 | ||||
| -rw-r--r-- | sources | 1 |
11 files changed, 23 insertions, 210 deletions
@@ -1,3 +1,4 @@ bind-9.4.1.tar.gz libbind-man.tar.gz bind-chroot.tar.bz2 +config.tar @@ -17,7 +17,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,21 +38,11 @@ Source11: named.service Source12: README.sdb_pgsql Source13: namedSetForwarders Source14: namedGetForwarders -Source16: named.caching-nameserver.conf -Source17: named.root -Source18: named.local -Source19: localhost.zone -Source20: localdomain.zone -Source21: named.ip6.local -Source22: named.broadcast -Source23: named.zero Source24: Copyright.caching-nameserver Source26: bind-chroot-admin.in -Source27: named.rfc1912.zones Source28: libbind.pc Source29: named.conf.sample -Source30: named.rfc1912.zones.sample -Source31: named.root.hints +Source32: config.tar # Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.3.3rc2-rndckey.patch @@ -451,17 +441,8 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # Ghost config files: touch ${RPM_BUILD_ROOT}/etc/named.conf # caching-nameserver files: -mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named} -install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.caching-nameserver.conf -install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones -install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}/var/named/named.ca -install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/var/named/named.local -install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/localhost.zone -install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/localdomain.zone -install -m 644 %{SOURCE21} ${RPM_BUILD_ROOT}/var/named/named.ip6.local -install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}/var/named/named.broadcast -install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}/var/named/named.zero -for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do +tar '-C' ${RPM_BUILD_ROOT} '-xf' %{SOURCE32} +for f in /etc/named.caching-nameserver.conf /etc/named.rfc1912.zones /var/named/{named.ca,named.localhost,named.empty,named.loopback}; do touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f; done install -m 644 %{SOURCE5} ./rfc1912.txt @@ -470,20 +451,20 @@ install -m 644 %{SOURCE24} ./Copyright sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin; install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} # sample bind configuration files for %doc: -mkdir -p sample/etc sample/var/named/{data,slaves} +mkdir -p sample/{etc,var/named/{data,slaves}} +for f in ${RPM_BUILD_ROOT}{/etc/named.rfc1912.zones,/var/named/{named.ca,named.localhost,named.empty,named.loopback}}; do + cp -fp $f sample; +done cp -fp %{SOURCE29} sample/etc/named.conf -cp -fp %{SOURCE30} sample/etc/named.rfc1912.zones -cp -fp %{SOURCE31} sample/etc/ -cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} sample/var/named for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do echo '@ in soa localhost. root 1 3H 15M 1W 1D - ns localhost.' > sample/var/named/$f; + ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.183 2007/06/05 12:16:15 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.184 2007/06/18 12:59:42 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: -;d}' > sample/etc/rndc.conf; +;d}' > sample/etc/rndc.conf; # chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*so.* :; @@ -733,18 +714,12 @@ rm -rf ${RPM_BUILD_ROOT} %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf %config %verify(not link) /var/named/named.ca %ghost %config %{chroot_prefix}/var/named/named.ca -%config %verify(not link) /var/named/named.local -%ghost %config %{chroot_prefix}/var/named/named.local -%config %verify(not link) /var/named/localhost.zone -%ghost %config %{chroot_prefix}/var/named/localhost.zone -%config %verify(not link) /var/named/localdomain.zone -%ghost %config %{chroot_prefix}/var/named/localdomain.zone -%config %verify(not link) /var/named/named.ip6.local -%ghost %config %{chroot_prefix}/var/named/named.ip6.local -%config %verify(not link) /var/named/named.broadcast -%ghost %config %{chroot_prefix}/var/named/named.broadcast -%config %verify(not link) /var/named/named.zero -%ghost %config %{chroot_prefix}/var/named/named.zero +%config %verify(not link) /var/named/named.localhost +%ghost %config %{chroot_prefix}/var/named/named.localhost +%config %verify(not link) /var/named/named.loopback +%ghost %config %{chroot_prefix}/var/named/named.loopback +%config %verify(not link) /var/named/named.empty +%ghost %config %{chroot_prefix}/var/named/named.empty %defattr(0644,root,root,0755) %doc Copyright %doc rfc1912.txt @@ -809,6 +784,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 18 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.fc7 +- major changes in default caching-nameserver configuration (configuration + could now honor RFCs, #243565) + * Tue Jun 05 2007 Adam Tkac <atkac redhat com> 31:9.4.1-5.fc7 - added /var/named/dynamic directory. This directory is primary designed for dynamic DNS zones. In future releases named could write only into diff --git a/named.broadcast b/named.broadcast deleted file mode 100644 index dca18f6..0000000 --- a/named.broadcast +++ /dev/null @@ -1,8 +0,0 @@ -$TTL 86400 -@ IN SOA localhost. root.localhost. ( - 42 ; serial (d. adams) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum - IN NS localhost. diff --git a/named.caching-nameserver.conf b/named.caching-nameserver.conf deleted file mode 100644 index bb06090..0000000 --- a/named.caching-nameserver.conf +++ /dev/null @@ -1,30 +0,0 @@ -// -// named.caching-nameserver.conf -// -// Provided by Red Hat caching-nameserver package to configure the -// ISC BIND named(8) DNS server as a caching only nameserver -// (as a localhost DNS resolver only). -// -// See /usr/share/doc/bind*/sample/ for example named configuration files. -// -// DO NOT EDIT THIS FILE - use system-config-bind or an editor -// to create named.conf - edits to this file will be lost on -// caching-nameserver package upgrade. -// -options { - listen-on port 53 { 127.0.0.1; }; - listen-on-v6 port 53 { ::1; }; - directory "/var/named"; - dump-file "/var/named/data/cache_dump.db"; - statistics-file "/var/named/data/named_stats.txt"; - memstatistics-file "/var/named/data/named_mem_stats.txt"; - allow-query { localhost; }; - recursion yes; -}; -logging { - channel default_debug { - file "data/named.run"; - severity dynamic; - }; -}; -include "/etc/named.rfc1912.zones"; diff --git a/named.ip6.local b/named.ip6.local deleted file mode 100644 index 4e0eb5e..0000000 --- a/named.ip6.local +++ /dev/null @@ -1,9 +0,0 @@ -$TTL 86400 -@ IN SOA localhost. root.localhost. ( - 1997022700 ; Serial - 28800 ; Refresh - 14400 ; Retry - 3600000 ; Expire - 86400 ) ; Minimum - IN NS localhost. -1 IN PTR localhost. diff --git a/named.local b/named.local deleted file mode 100644 index 479251a..0000000 --- a/named.local +++ /dev/null @@ -1,9 +0,0 @@ -$TTL 86400 -@ IN SOA localhost. root.localhost. ( - 1997022700 ; Serial - 28800 ; Refresh - 14400 ; Retry - 3600000 ; Expire - 86400 ) ; Minimum - IN NS localhost. -1 IN PTR localhost. diff --git a/named.rfc1912.zones b/named.rfc1912.zones deleted file mode 100644 index 143f1e8..0000000 --- a/named.rfc1912.zones +++ /dev/null @@ -1,49 +0,0 @@ -// named.rfc1912.zones: -// -// Provided by Red Hat caching-nameserver package -// -// ISC BIND named zone configuration for zones recommended by -// RFC 1912 section 4.1 : localhost TLDs and address zones -// -// See /usr/share/doc/bind*/sample/ for example named configuration files. -// -zone "." IN { - type hint; - file "named.ca"; -}; - -zone "localdomain" IN { - type master; - file "localdomain.zone"; - allow-update { none; }; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-update { none; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "named.local"; - allow-update { none; }; -}; - -zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN { - type master; - file "named.ip6.local"; - allow-update { none; }; -}; - -zone "255.in-addr.arpa" IN { - type master; - file "named.broadcast"; - allow-update { none; }; -}; - -zone "0.in-addr.arpa" IN { - type master; - file "named.zero"; - allow-update { none; }; -}; diff --git a/named.rfc1912.zones.sample b/named.rfc1912.zones.sample deleted file mode 100644 index c9b4aaf..0000000 --- a/named.rfc1912.zones.sample +++ /dev/null @@ -1,40 +0,0 @@ -// named.rfc1912.zones: -// -// ISC BIND named zone configuration for zones recommended by -// RFC 1912 section 4.1 : localhost TLDs and address zones -// -zone "localdomain" IN { - type master; - file "localdomain.zone"; - allow-update { none; }; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-update { none; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "named.local"; - allow-update { none; }; -}; - -zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN { - type master; - file "named.ip6.local"; - allow-update { none; }; -}; - -zone "255.in-addr.arpa" IN { - type master; - file "named.broadcast"; - allow-update { none; }; -}; - -zone "0.in-addr.arpa" IN { - type master; - file "named.zero"; - allow-update { none; }; -}; diff --git a/named.root.hints b/named.root.hints deleted file mode 100644 index 7c5971d..0000000 --- a/named.root.hints +++ /dev/null @@ -1,15 +0,0 @@ -// -// The 'named.root' root cache hints zone for the bind DNS 'named' nameserver. -// -// named's cache must be primed with the addresses of the root zone '.' nameservers. -// The root zone file can be obtained by querying the root 'A' nameserver: -// $ dig . ns @198.41.0.4 > named.root -// Or by download via FTP / HTTP: -// $ wget ftp://ftp.rs.internic.net/domain/named.root -// -// Every view that is to provide recursive service must include this zone. -// -zone "." IN { - type hint; - file "named.root"; -};
\ No newline at end of file diff --git a/named.zero b/named.zero deleted file mode 100644 index dca18f6..0000000 --- a/named.zero +++ /dev/null @@ -1,8 +0,0 @@ -$TTL 86400 -@ IN SOA localhost. root.localhost. ( - 42 ; serial (d. adams) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum - IN NS localhost. @@ -1,3 +1,4 @@ 09b54d35036cb0423b2e618f21766285 bind-9.4.1.tar.gz 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz 5306e4032389c2a8ddba678882bc82ad bind-chroot.tar.bz2 +80cbcb601139c7b6f219b93ed4ea7d9f config.tar |