Move pidfile to /run/named/named.pid

Signed-off-by: Adam Tkac <atkac@redhat.com>

8 files changed, 19 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 96c15bc..0ec0f32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.9.2.tar.gz
 /bind-9.9.2-P1.tar.gz
 /config-9.tar.bz2
+/config-10.tar.bz2
diff --git a/bind.spec b/bind.spec
index aca0780..b75da47 100644
--- a/bind.spec
+++ b/bind.spec
@@ -26,7 +26,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.9.2
-Release:  10.%{PATCHVER}%{?dist}
+Release:  11.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,7 +40,7 @@ Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
 Source12: README.sdb_pgsql
 Source25: named.conf.sample
-Source28: config-9.tar.bz2
+Source28: config-10.tar.bz2
 Source30: ldap2zone.c
 Source31: ldap2zone.1
 Source32: named-sdb.8
@@ -406,12 +406,12 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/{logrotate.d,NetworkManager/dispatcher.d}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
-mkdir -p ${RPM_BUILD_ROOT}/var/run/named
+mkdir -p ${RPM_BUILD_ROOT}/run/named
 mkdir -p ${RPM_BUILD_ROOT}/var/log
 
 #chroot
-mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/{dev,etc,var}
-mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/var/{log,named,run/named,tmp}
+mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/{dev,etc,var,run/named}
+mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/var/{log,named,tmp}
 mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/{pki/dnssec-keys,named}
 mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}/%{_libdir}/bind
 # these are required to prevent them being erased during upgrade of previous
@@ -671,7 +671,7 @@ rm -rf ${RPM_BUILD_ROOT}
 #    so rndc.conf is not necessary.
 %config(noreplace) %{_sysconfdir}/logrotate.d/named
 %defattr(-,named,named,-)
-%dir %{_localstatedir}/run/named
+%dir /run/named
 
 %if %{SDB}
 %files sdb
@@ -754,12 +754,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{chroot_prefix}/etc/pki
 %dir %{chroot_prefix}/etc/pki/dnssec-keys
 %dir %{chroot_prefix}/var
-%dir %{chroot_prefix}/var/run
+%dir %{chroot_prefix}/run
 %dir %{chroot_prefix}/var/named
 %dir %{chroot_prefix}/%{_libdir}/bind
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
 %defattr(0660,named,named,0770)
-%dir %{chroot_prefix}/var/run/named
+%dir %{chroot_prefix}/run/named
 %dir %{chroot_prefix}/var/tmp
 %dir %{chroot_prefix}/var/log
 %dir %{chroot_prefix}/usr
@@ -776,6 +776,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Mar 19 2013 Adam Tkac <atkac redhat com> 32:9.9.2-11.P1
+- move pidfile to /run/named/named.pid
+
 * Wed Mar 06 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.2-10.P1
 - Fix Makefile.in to include header added by rate limiting patch (#918330)
 
diff --git a/named-chroot.service b/named-chroot.service
index 84c775b..f11533c 100644
--- a/named-chroot.service
+++ b/named-chroot.service
@@ -12,7 +12,7 @@ After=network.target
 Type=forking
 EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/var/named/chroot/var/run/named/named.pid
+PIDFile=/var/named/chroot/run/named/named.pid
 
 ExecStartPre=/usr/libexec/generate-rndc-key.sh
 ExecStartPre=/usr/libexec/setup-named-chroot.sh /var/named/chroot on
diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service
index d9318da..23b632b 100644
--- a/named-sdb-chroot.service
+++ b/named-sdb-chroot.service
@@ -12,7 +12,7 @@ After=network.target
 Type=forking
 EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/var/named/chroot/var/run/named/named.pid
+PIDFile=/var/named/chroot/run/named/named.pid
 
 ExecStartPre=/usr/libexec/generate-rndc-key.sh
 ExecStartPre=/usr/libexec/setup-named-chroot.sh /var/named/chroot on
diff --git a/named-sdb.service b/named-sdb.service
index 424846d..ef3f6ab 100644
--- a/named-sdb.service
+++ b/named-sdb.service
@@ -8,7 +8,7 @@ After=network.target
 Type=forking
 EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
-PIDFile=/var/run/named/named.pid
+PIDFile=/run/named/named.pid
 
 ExecStartPre=/usr/libexec/generate-rndc-key.sh
 ExecStartPre=/usr/sbin/named-checkconf -z /etc/named.conf
diff --git a/named.conf.sample b/named.conf.sample
index 659fdc9..a071f38 100644
--- a/named.conf.sample
+++ b/named.conf.sample
@@ -60,6 +60,8 @@ options
 
 	/* Enable DLV by default, use built-in ISC DLV key. */
 	dnssec-lookaside auto;
+
+	pid-file "/run/named/named.pid";
 };
 
 logging 
diff --git a/setup-named-chroot.sh b/setup-named-chroot.sh
index 79e597c..5ef6a40 100755
--- a/setup-named-chroot.sh
+++ b/setup-named-chroot.sh
@@ -2,7 +2,7 @@
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /etc/named.root.key /etc/named.conf
 /etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
-/usr/lib64/bind /usr/lib/bind /etc/named.iscdlv.key /var/named'
+/usr/lib64/bind /usr/lib/bind /etc/named.iscdlv.key /var/named /run/named'
 
 usage()
 {
diff --git a/sources b/sources
index ee4f256..142a3b1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44b9d1feb11de09811160775f94c2554  bind-9.9.2-P1.tar.gz
-6f22bed78f41bc27fa6d885b648da63e  config-9.tar.bz2
+cb4a8ddb193f69b5643a6ae918596fc9  config-10.tar.bz2