From 0f6a81e0beb0778930105dee2138a73c37e91d2e Mon Sep 17 00:00:00 2001
From: darkside40 <darkside401@googlemail.com>
Date: Thu, 4 Dec 2014 16:18:00 +0100
Subject: Fixed start command, script location etc.

also renamed
---
 bin/updater/sysvinit/owncloud-news-update  | 61 ------------------------------
 bin/updater/sysvinit/owncloud-news-updater | 60 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 61 deletions(-)
 delete mode 100755 bin/updater/sysvinit/owncloud-news-update
 create mode 100755 bin/updater/sysvinit/owncloud-news-updater

(limited to 'bin')

diff --git a/bin/updater/sysvinit/owncloud-news-update b/bin/updater/sysvinit/owncloud-news-update
deleted file mode 100755
index 27142a2d0..000000000
--- a/bin/updater/sysvinit/owncloud-news-update
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
- 
-### BEGIN INIT INFO
-# Provides:          Owncloud News Update
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Owncloud News Custom Update script
-# Description:       Owncloud News Custom Update script
-### END INIT INFO
- 
-# Change the next 3 lines to suit where you install your script and what you want to call it
-DIR=/var/www/owncloud/apps/news/bin
-DAEMON=$DIR/updater.py
-DAEMON_NAME=owncloud-news-update
- 
-# Add any command line options for your Update Script here. I suggest loading an config file which holds user, pass etc.
-DAEMON_OPTS="--config $DIR/config.ini"
- 
-# This next line determines what user the script runs as.
-DAEMON_USER=nobody
- 
-# The process ID of the script when it runs is stored here:
-PIDFILE=/var/run/$DAEMON_NAME.pid
- 
-. /lib/lsb/init-functions
- 
-do_start () {
-    log_daemon_msg "Starting system $DAEMON_NAME daemon"
-    start-stop-daemon --start --background --pidfile $PIDFILE --make-pidfile --user $DAEMON_USER --$
-    log_end_msg $?
-}
-do_stop () {
-    log_daemon_msg "Stopping system $DAEMON_NAME daemon"
-    start-stop-daemon --stop --pidfile $PIDFILE --retry 10
-    log_end_msg $?
-}
-
- 
-case "$1" in
- 
-    start|stop)
-        do_${1}
-        ;;
- 
-    restart|reload|force-reload)
-        do_stop
-        do_start
-        ;;
- 
-    status)
-        status_of_proc "$DAEMON_NAME" "$DAEMON" && exit 0 || exit $?
-        ;;
-    *)
-        echo "Usage: /etc/init.d/$DAEMON_NAME {start|stop|restart|status}"
-        exit 1
-        ;;
- 
-esac
-exit 0
\ No newline at end of file
diff --git a/bin/updater/sysvinit/owncloud-news-updater b/bin/updater/sysvinit/owncloud-news-updater
new file mode 100755
index 000000000..19fbf022a
--- /dev/null
+++ b/bin/updater/sysvinit/owncloud-news-updater
@@ -0,0 +1,60 @@
+#!/bin/sh
+ 
+### BEGIN INIT INFO
+# Provides:          Owncloud News Update
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Owncloud News Custom Update script
+# Description:       Owncloud News Custom Update script
+### END INIT INFO
+ 
+# Change the next 3 lines to suit where you install your script and what you want to call it
+DIR=/usr/bin/owncloud-news-updater
+DAEMON=$DIR/updater.py
+DAEMON_NAME=owncloud-news-updater
+ 
+# Add any command line options for your Update Script here. I suggest loading an config file which holds user, pass etc.
+DAEMON_OPTS="--config /etc/owncloud/news/updater.ini"
+ 
+# This next line determines what user the script runs as.
+DAEMON_USER=nobody
+ 
+# The process ID of the script when it runs is stored here:
+PIDFILE=/var/run/$DAEMON_NAME.pid
+ 
+. /lib/lsb/init-functions
+ 
+do_start () {
+    log_daemon_msg "Starting system $DAEMON_NAME daemon"
+    start-stop-daemon --start --background --pidfile $PIDFILE --make-pidfile --user $DAEMON_USER --chuid $DAEMON_USER --startas $DAEMON -- $DAEMON_OPTS
+    log_end_msg $?
+}
+do_stop () {
+    log_daemon_msg "Stopping system $DAEMON_NAME daemon"
+    start-stop-daemon --stop --pidfile $PIDFILE --retry 10
+    log_end_msg $?
+}
+ 
+case "$1" in
+ 
+    start|stop)
+        do_${1}
+        ;;
+ 
+    restart|reload|force-reload)
+        do_stop
+        do_start
+        ;;
+ 
+    status)
+        status_of_proc "$DAEMON_NAME" "$DAEMON" && exit 0 || exit $?
+        ;;
+    *)
+        echo "Usage: /etc/init.d/$DAEMON_NAME {start|stop|restart|status}"
+        exit 1
+        ;;
+ 
+esac
+exit 0
-- 
cgit v1.2.3