diff options
| author | Unknwon <u@gogs.io> | 2015-03-18 01:30:06 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-18 01:30:06 -0400 |
| commit | 104d914b39be601ba46d5ad5f0ff095a0c710232 (patch) | |
| tree | a92ba5f52f5125b1b2c7d82fdf864197416cf278 | |
| parent | 8e815abeb01f7077bb90b0c7d80bd113f2ef7e0c (diff) | |
| parent | 8fa2056e145f193a3ee64e136b8be69891cef38e (diff) | |
| download | gitea-104d914b39be601ba46d5ad5f0ff095a0c710232.tar.gz gitea-104d914b39be601ba46d5ad5f0ff095a0c710232.zip | |
Merge branch 'develop' of github.com:gogits/gogs into develop
| -rw-r--r-- | scripts/init/centos/gogs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/init/centos/gogs b/scripts/init/centos/gogs index 90469498be..1a92ff2070 100644 --- a/scripts/init/centos/gogs +++ b/scripts/init/centos/gogs @@ -28,7 +28,6 @@ GOGS_HOME=/home/git/gogs GOGS_PATH=${GOGS_HOME}/$NAME GOGS_USER=git SERVICENAME="Gogs Go Git Service" -PID=/var/run/$NAME.pid LOCKFILE=/var/lock/subsys/gogs LOGFILE=${GOGS_HOME}/log/gogs.log RETVAL=0 @@ -39,7 +38,7 @@ RETVAL=0 # Don't do anything if nothing is installed [ -x ${GOGS_PATH} ] || exit 0 -DAEMON_OPTS="" +DAEMON_OPTS="--check $NAME" # Set additional options, if any [ ! -z "$GOGS_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GOGS_USER}" @@ -47,8 +46,7 @@ DAEMON_OPTS="" start() { cd ${GOGS_HOME} echo -n "Starting ${SERVICENAME}: " - daemon $DAEMON_OPTS --pidfile=${PID} "${GOGS_PATH} web 2>&1 > ${LOGFILE} &" - echo $! > ${PID} + daemon $DAEMON_OPTS "${GOGS_PATH} web > ${LOGFILE} 2>&1 &" RETVAL=$? echo [ $RETVAL = 0 ] && touch ${LOCKFILE} @@ -59,10 +57,10 @@ start() { stop() { cd ${GOGS_HOME} echo -n "Shutting down ${SERVICENAME}: " - killproc -p ${PID} ${NAME} + killproc ${NAME} RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PID} + [ $RETVAL = 0 ] && rm -f ${LOCKFILE} } case "$1" in @@ -74,7 +72,7 @@ case "$1" in stop ;; status) - status -p ${PID} ${NAME} + status ${NAME} ;; restart) stop |