From: Peter van Dijk Date: Mon, 31 Jul 2023 10:53:34 +0000 (+0200) Subject: remove unused sysv init files - we don't ship them, and non-systemd downstream packag... X-Git-Tag: rec-5.0.0-alpha1~75^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13087%2Fhead;p=thirdparty%2Fpdns.git remove unused sysv init files - we don't ship them, and non-systemd downstream packages all have their own --- diff --git a/.github/actions/spell-check/allow.txt b/.github/actions/spell-check/allow.txt index cc0e68a3b3..73351a6e17 100644 --- a/.github/actions/spell-check/allow.txt +++ b/.github/actions/spell-check/allow.txt @@ -427,7 +427,6 @@ checkrr checkzone chgrp childstat -chkconfig chmod chown chr diff --git a/builder-support/specs/pdns.init b/builder-support/specs/pdns.init deleted file mode 100644 index 7fd9b49296..0000000000 --- a/builder-support/specs/pdns.init +++ /dev/null @@ -1,213 +0,0 @@ - -# chkconfig: - 80 75 -# description: PDNS is a versatile high performance authoritative nameserver - -### BEGIN INIT INFO -# Provides: pdns -# Required-Start: $remote_fs $network $syslog -# Required-Stop: $remote_fs $network $syslog -# Should-Start: -# Should-Stop: -# Default-Start: -# Default-Stop: 0 1 6 -# Short-Description: PowerDNS authoritative server -# Description: PowerDNS authoritative server -### END INIT INFO - -set -e - -prefix=/usr -exec_prefix=/usr -BINARYPATH=/usr/bin -SBINARYPATH=/usr/sbin -SOCKETPATH=/var/run/pdns - -[ -f "$SBINARYPATH/pdns_server" ] || exit 0 - -[ -r /etc/default/pdns ] && . /etc/default/pdns - -mkdir -p $SOCKETPATH -cd $SOCKETPATH -suffix=$(basename $0 | cut -d- -f2- -s) -if [ -n "$suffix" ] -then - EXTRAOPTS=--config-name=$suffix - PROGNAME=pdns-$suffix -else - PROGNAME=pdns -fi - -pdns_server="$SBINARYPATH/pdns_server $EXTRAOPTS" - -doPC() -{ - ret=$($BINARYPATH/pdns_control $EXTRAOPTS $1 $2 2> /dev/null) -} - -NOTRUNNING=0 -doPC ping || NOTRUNNING=$? - -case "$1" in - status) - if test "$NOTRUNNING" = "0" - then - doPC status - echo $ret - else - echo "not running" - exit 3 - fi - ;; - - stop) - echo -n "Stopping PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - doPC quit - rm -f /var/lock/subsys/pdns - echo $ret - else - echo "not running" - fi - ;; - - - force-stop) - echo -n "Stopping PowerDNS authoritative nameserver: " - killall -v -9 pdns_server - rm -f /var/lock/subsys/pdns - echo "killed" - ;; - - start) - echo -n "Starting PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - echo "already running" - else - if $pdns_server --daemon --guardian=yes - then - touch /var/lock/subsys/pdns - echo "started" - else - echo "starting failed" - exit 1 - fi - fi - ;; - - condrestart) - if [ -f /var/lock/subsys/pdns ]; - then - echo "running, restarting" - $0 restart - else - echo "not running" - fi - ;; - - force-reload | restart) - echo -n "Restarting PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "1" - then - echo "not running, starting" - else - - echo -n stopping and waiting.. - doPC quit - sleep 3 - echo done - fi - $0 start - ;; - - reload) - echo -n "Reloading PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - doPC cycle - echo requested reload - else - echo not running yet - $0 start - fi - ;; - - monitor) - if test "$NOTRUNNING" = "0" - then - echo "already running" - else - $pdns_server --daemon=no --guardian=no --control-console --loglevel=9 - fi - ;; - - dump) - if test "$NOTRUNNING" = "0" - then - doPC list - echo $ret - else - echo "not running" - fi - ;; - - show) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - echo -n "$2=" - doPC show $2 ; echo $ret - else - echo "not running" - fi - ;; - - mrtg) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - doPC show $2 ; echo $ret - if [ "$3x" != "x" ] - then - doPC show $3 ; echo $ret - else - echo 0 - fi - doPC uptime ; echo $ret - echo PowerDNS daemon - else - echo "not running" - fi - - ;; - - cricket) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - doPC show $2 ; echo $ret - else - echo "not running" - fi - - ;; - - *) - echo pdns [start|stop|condrestart|force-reload|reload|restart|status|dump|show|mrtg|cricket|monitor] - - ;; -esac - diff --git a/configure.ac b/configure.ac index d6ad04a3c5..66480b71aa 100644 --- a/configure.ac +++ b/configure.ac @@ -346,7 +346,6 @@ AC_CONFIG_FILES([ pdns/Makefile codedocs/Makefile docs/Makefile - pdns/pdns.init ext/Makefile ext/arc4random/Makefile ext/ipcrypt/Makefile diff --git a/pdns/.gitignore b/pdns/.gitignore index 98d5c5cf55..b7e90bd0cc 100644 --- a/pdns/.gitignore +++ b/pdns/.gitignore @@ -4,7 +4,6 @@ /comfun /config.h /mkbindist -/pdns.init /showvar /stamp-h /pdns_control diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 5d188b1ce0..a1ba58ec50 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -115,7 +115,6 @@ endif apidocfiles.h: api-swagger.yaml api-swagger.json ./incfiles $^ > $@ -noinst_SCRIPTS = pdns.init sysconf_DATA = pdns.conf-dist sbin_PROGRAMS = pdns_server diff --git a/pdns/pdns.init.in b/pdns/pdns.init.in deleted file mode 100755 index 7aba99be05..0000000000 --- a/pdns/pdns.init.in +++ /dev/null @@ -1,206 +0,0 @@ -#!/bin/sh -# chkconfig: - 80 75 -# description: PDNS is a versatile high performance authoritative nameserver - -### BEGIN INIT INFO -# Provides: pdns -# Required-Start: $remote_fs $network $syslog -# Required-Stop: $remote_fs $network $syslog -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: PowerDNS authoritative server -# Description: PowerDNS authoritative server -### END INIT INFO - -set -e - -exec_prefix=@exec_prefix@ -BINARYPATH=@bindir@ -SBINARYPATH=@sbindir@ -SOCKETPATH=@socketdir@/pdns -DAEMON_ARGS="" - -[ -f "$SBINARYPATH/pdns_server" ] || exit 0 - -[ -r /etc/default/pdns ] && . /etc/default/pdns - -[ "$START" = "no" ] && exit 0 - -# Make sure that /var/run exists -mkdir -p $SOCKETPATH -cd $SOCKETPATH -suffix=$(basename $0 | cut -d- -f2- -s) -if [ -n "$suffix" ] -then - EXTRAOPTS=--config-name=$suffix - PROGNAME=pdns-$suffix -else - PROGNAME=pdns -fi - -pdns_server="$SBINARYPATH/pdns_server $DAEMON_ARGS $EXTRAOPTS" - -doPC() -{ - ret=$($BINARYPATH/pdns_control $EXTRAOPTS $1 $2 2> /dev/null) -} - -NOTRUNNING=0 -doPC ping || NOTRUNNING=$? - -case "$1" in - status) - if test "$NOTRUNNING" = "0" - then - doPC status - echo $ret - else - echo "not running" - exit 3 - fi - ;; - - stop) - echo -n "Stopping PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - doPC quit - echo $ret - else - echo "not running" - fi - ;; - - - force-stop) - echo -n "Stopping PowerDNS authoritative nameserver: " - killall -v -9 pdns_server - echo "killed" - ;; - - start) - echo -n "Starting PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - echo "already running" - else - if $pdns_server --daemon --guardian=yes - then - echo "started" - else - echo "starting failed" - exit 1 - fi - fi - ;; - - force-reload | restart) - echo -n "Restarting PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "1" - then - echo "not running, starting" - else - - echo -n stopping and waiting.. - doPC quit - sleep 3 - echo done - fi - $0 start - ;; - - reload) - echo -n "Reloading PowerDNS authoritative nameserver: " - if test "$NOTRUNNING" = "0" - then - doPC cycle - echo requested reload - else - echo not running yet - $0 start - fi - ;; - - monitor) - if test "$NOTRUNNING" = "0" - then - echo "already running" - else - $pdns_server --daemon=no --guardian=no --control-console --loglevel=9 - fi - ;; - - dump) - if test "$NOTRUNNING" = "0" - then - doPC list - echo $ret - else - echo "not running" - fi - ;; - - show) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - echo -n "$2=" - doPC show $2 ; echo $ret - else - echo "not running" - fi - ;; - - mrtg) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - doPC show $2 ; echo $ret - if [ "$3x" != "x" ] - then - doPC show $3 ; echo $ret - else - echo 0 - fi - doPC uptime ; echo $ret - echo PowerDNS daemon - else - echo "not running" - fi - - ;; - - cricket) - if [ $# -lt 2 ] - then - echo Insufficient parameters - exit - fi - if test "$NOTRUNNING" = "0" - then - doPC show $2 ; echo $ret - else - echo "not running" - fi - - ;; - - - - *) - echo pdns [start\|stop\|force-reload\|reload\|restart\|status\|dump\|show\|mrtg\|cricket\|monitor] - - ;; -esac - - diff --git a/pdns/recursordist/pdns-recursor.init.d b/pdns/recursordist/pdns-recursor.init.d deleted file mode 100755 index 538e58f1e3..0000000000 --- a/pdns/recursordist/pdns-recursor.init.d +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: pdns-recursor -# Required-Start: $network $remote_fs $syslog -# Required-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: PowerDNS Recursor -### END INIT INFO -# chkconfig: - 80 75 -# description: pdns_recursor is a versatile high performance recursing nameserver - -BINARYPATH=/usr/bin -SBINARYPATH=/usr/sbin -SOCKETPATH=/var/run - -pdns_server=$SBINARYPATH/pdns_recursor - -[ -f "$pdns_server" ] || exit 0 - -[ -r /etc/default/pdns-recursor ] && . /etc/default/pdns-recursor - -[ "$START" = "no" ] && exit 0 - -doPC() -{ - ret=`$BINARYPATH/rec_control $EXTRAOPTS $1 $2 2> /dev/null` -} - - -doPC ping -NOTRUNNING=$? - -case "$1" in - status) - if test "$NOTRUNNING" = "0" - then - echo "running" - exit 0 - else - echo "not running" - # Note: 3 is a white lie. We currently don't *really* - # know that it's not running, or if the ping failed for - # other reasons (= 4). - exit 3 - fi - ;; - - stop) - echo -n "Stopping PowerDNS recursing nameserver: " - if test "$NOTRUNNING" = "0" - then - doPC quit - echo $ret - else - echo "not running" - exit 1 - fi - ;; - - - force-stop) - echo -n "Stopping PowerDNS recursing nameserver: " - killall -v -9 $pdns_server - echo "killed" - ;; - - start) - echo -n "Starting PowerDNS recursing nameserver: " - if test "$NOTRUNNING" = "0" - then - echo "already running" - exit 1 - else - $pdns_server --daemon - if test "$?" = "0" - then - echo "started" - fi - fi - ;; - - force-reload | restart) - echo -n "Restarting PowerDNS recursing nameserver: " - echo -n stopping and waiting.. - doPC quit - sleep 3 - echo done - $0 start - ;; - - monitor) - if test "$NOTRUNNING" = "0" - then - echo "already running" - else - $pdns_server --daemon=no --quiet=no --loglevel=9 - fi - ;; - - *) - echo pdns [start\|stop\|force-reload\|restart\|status\|monitor] - - ;; -esac - -