From 83f9edb353bfd01a57cd0fefa26816c132b0eacc Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 22 Oct 2014 17:32:31 +0000
Subject: testing/yadifa: fixed init and pid file name

---
 testing/yadifa/APKBUILD            |  3 +--
 testing/yadifa/yadifa.confd        |  2 +-
 testing/yadifa/yadifa.initd        | 13 ++++---------
 testing/yadifa/yadifa.post-install |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'testing/yadifa')

diff --git a/testing/yadifa/APKBUILD b/testing/yadifa/APKBUILD
index 119e57fc0..018fed03b 100644
--- a/testing/yadifa/APKBUILD
+++ b/testing/yadifa/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=yadifa
 pkgver=2.0.0
 _buildnr=4192
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight authoritative Name Server with DNSSEC capabilities"
 url="http://www.yadifa.eu"
 arch="all"
@@ -36,7 +36,6 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	automake
 	./configure --prefix=/usr \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/testing/yadifa/yadifa.confd b/testing/yadifa/yadifa.confd
index 5ad10b114..4f86cc0d2 100644
--- a/testing/yadifa/yadifa.confd
+++ b/testing/yadifa/yadifa.confd
@@ -1,4 +1,4 @@
 SVCBIN="/usr/sbin/yadifad"
 CONFFILE="/etc/yadifa/yadifad.conf"
-PIDFILE="/var/run/yadifa/yadifad.pid"
+PIDFILE="/var/run/yadifa/yadifa.pid"
 YADIFA_OPTS=""
diff --git a/testing/yadifa/yadifa.initd b/testing/yadifa/yadifa.initd
index 228e4af10..ae0d67fc4 100644
--- a/testing/yadifa/yadifa.initd
+++ b/testing/yadifa/yadifa.initd
@@ -8,7 +8,6 @@ depend() {
 	provide dns
 }
 
-
 checkconfig() {
         if [ ! -f "${CONFFILE}" ]; then
                 eerror "${CONFFILE} does not exist!"
@@ -18,23 +17,19 @@ checkconfig() {
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	ulimit -c unlimited
 	start-stop-daemon --start --exec ${SVCBIN} \
 		--pidfile ${PIDFILE} \
 		-- -c ${CONFFILE} ${YADIFA_OPTS}
 	eend $?
 }
 
-
 stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --start --exec ${SVCBIN} \
-		--pidfile ${PIDFILE} \
-	eend $?
+        ebegin "Stopping ${SVCNAME}"
+        start-stop-daemon --stop --exec ${SVCBIN} \
+                --pidfile ${PIDFILE}
+        eend $?
 }
 
-
-
 reload() {
         ebegin "Reloading ${SVCNAME}"
 	start-stop-daemon --stop --oknodo --signal HUP \
diff --git a/testing/yadifa/yadifa.post-install b/testing/yadifa/yadifa.post-install
index ea3599900..87816a60f 100755
--- a/testing/yadifa/yadifa.post-install
+++ b/testing/yadifa/yadifa.post-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 sed -i -e "s/daemon.*/daemon\ton/" /etc/yadifa/yadifad.conf  >&2
 sed -i -e "s/logpath.*/logpath\t\t\"\/var\/log\/yadifa\"/" /etc/yadifa/yadifad.conf  >&2
-sed -i -e "s/pidpath.*/pidfile\t\t\"\/var\/run\/yadifa\"/" /etc/yadifa/yadifad.conf  >&2
+sed -i -e "s/pidpath.*/pidfile\t\t\"\/var\/run\/yadifa\/yadifa\.pid\"/" /etc/yadifa/yadifad.conf  >&2
 exit 0
-- 
cgit v1.2.3