From a64a65ba698044926c1bdf9d9fad4a4130c82012 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Thu, 22 Jun 2017 11:51:08 +0200 Subject: [PATCH] Rec: create socket-dir from init-script Closes #5439 --- build-scripts/build-recursor-rpm | 6 +++++- build-scripts/debian-recursor/pdns-recursor.init | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm index e05f3bd0cd..960ec6ceb7 100755 --- a/build-scripts/build-recursor-rpm +++ b/build-scripts/build-recursor-rpm @@ -64,6 +64,10 @@ if [ -f /etc/redhat-release ]; then RETVAL=0 +PIDDIR=\$(awk -F= '/^socket-dir=/ {print \$2}' /etc/powerdns/recursor.conf) +if [ -z "\$PIDDIR" ]; then PIDDIR=/var/run; fi +mkdir -p "\$PIDDIR" + start() { echo -n \$"Starting pdns-recursor: " daemon /usr/sbin/pdns_recursor --daemon 2>/dev/null @@ -76,7 +80,7 @@ stop() { echo -n \$"Stopping pdns-recursor: " killproc pdns_recursor echo - [ \$RETVAL -eq 0 ] && rm -f /var/lock/subsys/pdns-recursor && rm -f /var/run/pdns_recursor.controlsocket + [ \$RETVAL -eq 0 ] && rm -f /var/lock/subsys/pdns-recursor && rm -f \$PIDDIR/pdns_recursor.controlsocket } restart() { diff --git a/build-scripts/debian-recursor/pdns-recursor.init b/build-scripts/debian-recursor/pdns-recursor.init index 5ab22c2011..4ab0383764 100644 --- a/build-scripts/debian-recursor/pdns-recursor.init +++ b/build-scripts/debian-recursor/pdns-recursor.init @@ -28,6 +28,7 @@ DAEMON=/usr/sbin/$NAME # or fall back to the default /var/run if not specified there. PIDDIR=$(awk -F= '/^socket-dir=/ {print $2}' /etc/powerdns/recursor.conf) if [ -z "$PIDDIR" ]; then PIDDIR=/var/run; fi +mkdir -p "$PIDDIR" PIDFILE=$PIDDIR/$NAME.pid # Gracefully exit if the package has been removed. -- 2.47.2