From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Wed, 23 Mar 2016 14:09:12 +0000 (+0100)
Subject: systemd unit file fixes
X-Git-Tag: auto/th/bind-9.10.3.P4-2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=b71dca7346cc81e9af740a2a61d5622fa96fc102;p=packages%2Fbind.git

systemd unit file fixes

Release: 2
---

diff --git a/bind.spec b/bind.spec
index 2e8dade..5f15e09 100644
--- a/bind.spec
+++ b/bind.spec
@@ -45,7 +45,7 @@ Summary(uk.UTF-8):	BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):	Internet 域名服务器
 Name:		bind
 Version:	%{ver}%{pverdot}
-Release:	1
+Release:	2
 Epoch:		7
 License:	BSD-like
 Group:		Networking/Daemons
diff --git a/named.service b/named.service
index a44101a..33ccd20 100644
--- a/named.service
+++ b/named.service
@@ -9,13 +9,13 @@ Type=forking
 PrivateTmp=true
 Environment=CHROOT_TO_DIR=/var/lib/named
 EnvironmentFile=-/etc/sysconfig/named
-ExecStartPre=touch $CHROOT_TO_DIR/named.log
-ExecStartPre=chown named:named $CHROOT_TO_DIR/named.log
-ExecStartPre=/usr/sbin/named-checkconf -t $CHROOT_TO_DIR -z /etc/named.conf
-ExecStart=/usr/sbin/named -u named -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT
+ExecStartPre=/bin/touch ${CHROOT_TO_DIR}/named.log
+ExecStartPre=/bin/chown named:named ${CHROOT_TO_DIR}/named.log
+ExecStartPre=/usr/sbin/named-checkconf -t ${CHROOT_TO_DIR} -z /etc/named.conf
+ExecStart=/usr/sbin/named -u named -t ${CHROOT_TO_DIR} -c /etc/named.conf ${NAMED_OPT}
 ExecStop=/bin/sh -c '[ -f /etc/rndc.conf ] && /usr/sbin/rndc stop || /bin/kill -TERM $MAINPID'
 ExecReload=/bin/sh -c '[ -f /etc/rndc.conf ] && /usr/sbin/rndc reload || /bin/kill -HUP $MAINPID'
-PIDFile=$CHROOT_TO_DIR/named.pid
+PIDFile=/var/lib/named/named.pid
 
 [Install]
 WantedBy=multi-user.target