Added reload-command to openrc and sysvinit initscripts.

4 files changed, 31 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7743579fc0d..1cb839d0ff16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,9 +35,9 @@ pkgbase = wwwoffle-svn
 	source = wwwoffle.install
 	sha256sums = SKIP
 	sha256sums = cd05738f73b109dd074f6dd919300eeae55c2aa812a15e0ae61b32622423c867
-	sha256sums = 0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11
+	sha256sums = 090329f13d8889a3e6e3b46b3f9de152eea0963b71c10a2a7dbafb7bb7e17120
 	sha256sums = 04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869
-	sha256sums = 47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df
+	sha256sums = 3938777ba2baa7faac569d4a4a8a8cb7adeef786cfa84e991b6f03e991bcfae8
 	sha256sums = 1b5ac98fff7a5c7b32439410cffdbdd8224c19fe8ca02db948d1a4430de793fd
 
 pkgname = wwwoffle-svn
diff --git a/PKGBUILD b/PKGBUILD
index 277072b9f0e9..e79ed4e2c078 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -53,13 +53,13 @@ source=(
 )
 
 sha256sums=(
-  # 'e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae'
-  'SKIP'
-  'cd05738f73b109dd074f6dd919300eeae55c2aa812a15e0ae61b32622423c867'
-  '0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11'
-  '04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869'
-  '47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df'
-  '1b5ac98fff7a5c7b32439410cffdbdd8224c19fe8ca02db948d1a4430de793fd'
+  # 'e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae' # Main source, release
+  'SKIP'                                                             # Main source, SVN
+  'cd05738f73b109dd074f6dd919300eeae55c2aa812a15e0ae61b32622423c867' # conf_d_wwwoffle
+  '090329f13d8889a3e6e3b46b3f9de152eea0963b71c10a2a7dbafb7bb7e17120' # initscript_openrc
+  '04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869' # initscript_systemd
+  '3938777ba2baa7faac569d4a4a8a8cb7adeef786cfa84e991b6f03e991bcfae8' # initscript_sysvinit
+  '1b5ac98fff7a5c7b32439410cffdbdd8224c19fe8ca02db948d1a4430de793fd' # ${install}
 )
 
 _pgmver() {
diff --git a/initscript_openrc b/initscript_openrc
index b40d3ffb67e6..c6b2bf215c1a 100644
--- a/initscript_openrc
+++ b/initscript_openrc
@@ -8,6 +8,8 @@ _DAEMON_ARGS=(
               ${WWWOFFLE_ARGS}
              )
 
+extra_started_commands="reload"
+
 depend() {
   use logger dns
 }
@@ -27,3 +29,10 @@ stop() {
   
   eend "$?"
 }
+
+reload() {
+  ebegin "Re-reading configuration file for $(basename "${_DAEMON}")"
+  wwwoffle "${_DAEMON_ARGS[@]}" -config
+  eend "$?"
+}
+
diff --git a/initscript_sysvinit b/initscript_sysvinit
index 5c2f7d9838bb..c68fe5858b07 100644
--- a/initscript_sysvinit
+++ b/initscript_sysvinit
@@ -26,23 +26,33 @@ case "$1" in
       add_daemon wwwoffle
       stat_done
     fi
-    ;;
+  ;;
   stop)
     stat_busy "Stopping ${_pretty_name}"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
       rm_daemon wwwoffle
       stat_done
     fi
-    ;;
+  ;;
   restart)
     $0 stop
     sleep 5
     $0 start
     ;;
+  reload)
+    stat_busy "Re-reading configuration file of ${_pretty_name}"
+    wwwoffle "${_DAEMON_ARGS[@]}" -config
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+    fi
+  ;;
   *)
     echo "usage: $0 {start|stop|restart}"  
+  ;;
 esac
 exit 0