gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also use killproc.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-08-14 23:13:26 +02:00
parent cea9205136
commit eaaa0c1f7f
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
advanced/Templates/pihole-FTL.service
View File

@@ -10,17 +10,14 @@
### END INIT INFO ### END INIT INFO
FTLUSER=pihole FTLUSER=pihole
BINARY="/usr/bin/pihole-FTL"
PIDFILE=/var/run/pihole-FTL.pid PIDFILE=/var/run/pihole-FTL.pid
. /lib/lsb/init-functions . /lib/lsb/init-functions
get_pid() {
pidof "pihole-FTL"
}
# Start the service # Start the service
start() { start() {
if get_pid > /dev/null 2>&1; then if pidofproc -p "${PIDFILE}" > /dev/null 2>&1; then
echo "pihole-FTL is already running" echo "pihole-FTL is already running"
else else
# Touch files to ensure they exist (create if non-existing, preserve if existing) # Touch files to ensure they exist (create if non-existing, preserve if existing)
@@ -40,10 +37,10 @@ start() {
chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log
echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.piholeFTL echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.piholeFTL
if setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "$(which pihole-FTL)"; then if setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "$(which pihole-FTL)"; then
start_daemon -p "${PIDFILE}" /usr/bin/su -s /bin/sh -c "/usr/bin/pihole-FTL -f" "$FTLUSER" & start_daemon -p "${PIDFILE}" /usr/bin/su -s /bin/sh -c "${BINARY} -f" "$FTLUSER" &
else else
echo "Warning: Starting pihole-FTL as root because setting capabilities is not supported on this system" echo "Warning: Starting pihole-FTL as root because setting capabilities is not supported on this system"
start_daemon -p "${PIDFILE}" "/usr/bin/pihole-FTL" -f & start_daemon -p "${PIDFILE}" "${BINARY}" -f &
fi fi
echo echo
fi fi
@@ -51,11 +48,11 @@ start() {
# Stop the service # Stop the service
stop() { stop() {
if get_pid > /dev/null 2>&1; then if pidofproc -p "${PIDFILE}" > /dev/null 2>&1; then
/sbin/resolvconf -d lo.piholeFTL /sbin/resolvconf -d lo.piholeFTL
kill "$(get_pid)" killproc -p "${PIDFILE}" "${BINARY}"
for i in {1..5}; do for i in {1..5}; do
if ! get_pid > /dev/null 2>&1; then if ! pidofproc -p "${PIDFILE}" > /dev/null 2>&1; then
break break
fi fi
@@ -64,9 +61,9 @@ stop() {
done done
echo echo
if get_pid > /dev/null 2>&1; then if pidofproc -p "${PIDFILE}" > /dev/null 2>&1; then
echo "Not stopped; may still be shutting down or shutdown may have failed, killing now" echo "Not stopped; may still be shutting down or shutdown may have failed, killing now"
kill -9 "$(get_pid)" killproc -p "${PIDFILE}" "${BINARY}" 9
exit 1 exit 1
else else
echo "Stopped" echo "Stopped"
@@ -79,7 +76,7 @@ stop() {
# Indicate the service status # Indicate the service status
status() { status() {
if get_pid > /dev/null 2>&1; then if pidofproc -p "${PIDFILE}" > /dev/null 2>&1; then
echo "[ ok ] pihole-FTL is running" echo "[ ok ] pihole-FTL is running"
exit 0 exit 0
else else