From dbd76f7a57f5e803b21bcc3236e4d814e254fb4f Mon Sep 17 00:00:00 2001
From: Daniel van Dorp <daniel@vandorp.biz>
Date: Wed, 10 Aug 2016 06:29:13 +0200
Subject: [PATCH] dist/init/linux-sysvinit: process @weingart's feedback
(#1008)
* dist/init/linux-sysvinit: use kill -0 to test process status
* dist/init/linux-sysvinit: use service (as root) instead of /etc/init.d/
---
dist/init/linux-sysvinit/README.md | 2 +-
dist/init/linux-sysvinit/caddy | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dist/init/linux-sysvinit/README.md b/dist/init/linux-sysvinit/README.md
index bd470288e..02d86dc5d 100644
--- a/dist/init/linux-sysvinit/README.md
+++ b/dist/init/linux-sysvinit/README.md
@@ -8,4 +8,4 @@ Usage
* Save the SysVinit config file in `/etc/init.d/caddy`.
* Ensure that the folder `/etc/caddy` exists and that the subfolder `ssl` is owned by `www-data`.
* Create a Caddyfile in `/etc/caddy/Caddyfile`
-* Now you can use `sudo /etc/init.d/caddy start|stop|restart|reload|status`.
+* Now you can use `service caddy start|stop|restart|reload|status` as `root`.
diff --git a/dist/init/linux-sysvinit/caddy b/dist/init/linux-sysvinit/caddy
index 70ddd3226..e723fe171 100644
--- a/dist/init/linux-sysvinit/caddy
+++ b/dist/init/linux-sysvinit/caddy
@@ -53,11 +53,10 @@ reload() {
status() {
if [ -f $PIDFILE ]; then
- PID=`cat $PIDFILE`
- if [ -z "`ps axf | grep ${PID} | grep -v grep`" ]; then
- echo "$NAME process is dead, but pidfile exists"
- else
+ if kill -0 $(cat "$PIDFILE"); then
echo "$NAME is running"
+ else
+ echo "$NAME process is dead, but pidfile exists"
fi
else
echo "$NAME is not running"