diff options
| author | Danny B <silverkorn@gmail.com> | 2014-09-30 21:30:16 -0400 |
|---|---|---|
| committer | Danny B <silverkorn@gmail.com> | 2014-09-30 21:30:16 -0400 |
| commit | 98c719c342d796e4e651270ca4a43523df721251 (patch) | |
| tree | 414be7fbbc9e4b89f6448dc250ed103f9b88554f | |
| parent | f7de6d2b86e7e56a46d2763800760ac16ae363d3 (diff) | |
| download | gitea-98c719c342d796e4e651270ca4a43523df721251.tar.gz gitea-98c719c342d796e4e651270ca4a43523df721251.zip | |
Debian's Init.d workaround for loading user's environment variables with `start-stop-daemon` command.
Implies 2 running child, so the `stop` command usually needs a `KILL` instead of a `TERM` to close properly so I reduced it to 1 second to get quickly with the `KILL` signal.
| -rw-r--r-- | scripts/init/debian/gogs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/init/debian/gogs b/scripts/init/debian/gogs index b82df1de57..13e8b8aa5b 100644 --- a/scripts/init/debian/gogs +++ b/scripts/init/debian/gogs @@ -31,11 +31,6 @@ USER=git # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 -# Prepare the starting daemon command depending on available non-mandatory variables -STARTDEAMONEVALOPTS="" -[ ! -z "$USER" ] && STARTDEAMONEVALOPTS="$STARTDEAMONEVALOPTS --chuid $USER " -[ ! -z "$WORKINGDIR" ] && STARTDEAMONEVALOPTS="$STARTDEAMONEVALOPTS --chdir \"$WORKINGDIR\" " - # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh @@ -54,10 +49,10 @@ do_start() # 1 if daemon was already running # 2 if daemon could not be started sh -c "start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ - $STARTDEAMONEVALOPTS --exec $DAEMON -- $DAEMON_ARGS --test > /dev/null \\ + --exec $DAEMON -- $DAEMON_ARGS --test > /dev/null \\ || return 1" sh -c "start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ - $STARTDEAMONEVALOPTS --background --exec $DAEMON -- $DAEMON_ARGS \\ + --background --exec /bin/su -- - $USER -c \"cd \\\"$WORKINGDIR\\\" && $DAEMON -- $DAEMON_ARGS\" \\ || return 2" } @@ -71,10 +66,10 @@ do_stop() # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --quiet --retry=TERM/1/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 - start-stop-daemon --stop --quiet --oknodo --retry=0/10/KILL/5 --exec $DAEMON + start-stop-daemon --stop --quiet --oknodo --retry=0/1/KILL/5 --exec $DAEMON [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE |