[Pkg-privacy-commits] [onioncat] 159/340: debian start script updated

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 298f672726e73b72cea2a7e256fe706b639f7cff
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Sat Feb 21 11:05:24 2009 +0000

    debian start script updated
    
    git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@471 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 debian/init.d           | 10 ++++------
 debian/onioncat.default |  7 ++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/init.d b/debian/init.d
index 1ee792c..be779fd 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -29,14 +29,14 @@ test -x $DAEMON || exit 0
 
 # Default options, these can be overriden by the information
 # at /etc/default/$NAME
-DAEMON_OPTS="-u debian-tor"          # Additional options given to the server
+DAEMON_OPTS=""          # Additional options given to the server
 
 DIETIME=10              # Time to wait for the server to die, in seconds
                         # If this value is set too low you might not
                         # let some servers to die gracefully and
                         # 'restart' will not work
 
-#STARTTIME=2             # Time to wait for the server to start, in seconds
+STARTTIME=1             # Time to wait for the server to start, in seconds
                         # If this value is set each time the server is
                         # started (on start or restart) the script will
                         # stall to try to determine if it is running
@@ -46,7 +46,7 @@ DIETIME=10              # Time to wait for the server to die, in seconds
                         # when it actually did)
 
 LOGFILE=$LOGDIR/$NAMEL.log
-#DAEMONUSER=debian-tor # Users to run the daemons as. If this value
+DAEMONUSER="debian-tor" # Users to run the daemons as. If this value
                         # is set start-stop-daemon will chuid the server
 
 # Defaults - don't touch, edit /etc/default/onioncat
@@ -124,8 +124,7 @@ start_server() {
         else
 # if we are using a daemonuser then change the user id
             start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --chuid $DAEMONUSER \
-                        --exec $DAEMON -- $DAEMON_OPTS
+                        --exec $DAEMON -- -u $DAEMONUSER $DAEMON_OPTS
             errcode=$?
         fi
         return $errcode
@@ -139,7 +138,6 @@ stop_server() {
         else
 # if we are using a daemonuser then look for process that match
             start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --user $DAEMONUSER \
                         --exec $DAEMON
             errcode=$?
         fi
diff --git a/debian/onioncat.default b/debian/onioncat.default
index 705913f..e7532ac 100644
--- a/debian/onioncat.default
+++ b/debian/onioncat.default
@@ -7,10 +7,11 @@
 # HiddenServiceDir /var/lib/tor/hidden_service/
 # HiddenServicePort 8060 127.0.0.1:8060
 #
-# After doing so, get your Hosyname from: /var/lib/tor/hidden_service/hostname
+# After doing so, get your hostname from: /var/lib/tor/hidden_service/hostname
 # and append it to the DAEMON options.
 # For Example:
-# DAEMON="-u debian-tor gfwljfhnapq91sz4.onion"
+# DAEMON_OPTS="gfwljfhnapq91sz4.onion"
 # and !!!! SET ENABLED=1 !!!!
 ENABLED=0
-DAEMON_OPTS="-u debian-tor <HiddenService url>"
+DAEMONUSER="debian-tor"
+DAEMON_OPTS=""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git