From b7263f31a5a0a4a0ac8fe92c83563d7b7dcf7423 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 7 Nov 2016 11:41:50 +0100 Subject: Replace GOGS with GITEA in variable names Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables as a fallback if the equivalent GITEA_* are not set, warning user about the need for change. Does not change "gogs" to "gitea" in webhook type name Because "gogs" hook type is part of the API (routes) and used in templates... Closes #87 --- Dockerfile | 2 +- Dockerfile.rpi | 2 +- docker/build.sh | 2 +- docker/s6/gogs/setup | 2 +- models/pull.go | 2 +- modules/setting/setting.go | 22 +++++++++++++++++++--- routers/repo/pull.go | 2 +- scripts/init/centos/gogs | 18 +++++++++--------- scripts/init/freebsd/gogs | 2 +- scripts/init/suse/gogs | 18 +++++++++--------- 10 files changed, 44 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a3c405118..aa6c834e20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-amd64 /usr/sbin/go RUN chmod +x /usr/sbin/gosu \ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat tzdata -ENV GOGS_CUSTOM /data/gogs +ENV GITEA_CUSTOM /data/gogs COPY . /app/gogs/ WORKDIR /app/gogs/ diff --git a/Dockerfile.rpi b/Dockerfile.rpi index 8fbe8252b6..8e034fe204 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -9,7 +9,7 @@ RUN chmod +x /usr/sbin/gosu \ && apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat tzdata -ENV GOGS_CUSTOM /data/gogs +ENV GITEA_CUSTOM /data/gogs COPY . /app/gogs/ WORKDIR /app/gogs/ diff --git a/docker/build.sh b/docker/build.sh index fb98b12b87..9965cef376 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -33,4 +33,4 @@ apk --no-progress del build-deps # Create git user for Gogs adduser -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && passwd -u git -echo "export GOGS_CUSTOM=${GOGS_CUSTOM}" >> /etc/profile +echo "export GITEA_CUSTOM=${GITEA_CUSTOM}" >> /etc/profile diff --git a/docker/s6/gogs/setup b/docker/s6/gogs/setup index 40bd82b28a..8435e25b6b 100755 --- a/docker/s6/gogs/setup +++ b/docker/s6/gogs/setup @@ -6,7 +6,7 @@ if ! test -d ~git/.ssh; then fi if ! test -f ~git/.ssh/environment; then - echo "GOGS_CUSTOM=${GOGS_CUSTOM}" > ~git/.ssh/environment + echo "GITEA_CUSTOM=${GITEA_CUSTOM}" > ~git/.ssh/environment chmod 600 ~git/.ssh/environment fi diff --git a/models/pull.go b/models/pull.go index ae508103d0..20ea1b87c5 100644 --- a/models/pull.go +++ b/models/pull.go @@ -26,7 +26,7 @@ var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLe type PullRequestType int const ( - PULL_REQUEST_GOGS PullRequestType = iota + PULL_REQUEST_GITEA PullRequestType = iota PLLL_ERQUEST_GIT ) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 923c45674c..1ddbf6d2bc 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -297,10 +297,18 @@ func init() { // WorkDir returns absolute path of work directory. func WorkDir() (string, error) { - wd := os.Getenv("GOGS_WORK_DIR") + wd := os.Getenv("GITEA_WORK_DIR") if len(wd) > 0 { return wd, nil } + // Use GOGS_WORK_DIR if available, for backward compatibility + // TODO: drop in 1.1.0 ? + wd = os.Getenv("GOGS_WORK_DIR") + if len(wd) > 0 { + log.Warn(`Usage of GOGS_WORK_DIR is deprecated and will be *removed* in a future release, +please consider changing to GITEA_WORK_DIR`) + return wd, nil + } i := strings.LastIndex(AppPath, "/") if i == -1 { @@ -341,9 +349,17 @@ func NewContext() { log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) } - CustomPath = os.Getenv("GOGS_CUSTOM") + CustomPath = os.Getenv("GITEA_CUSTOM") if len(CustomPath) == 0 { - CustomPath = workDir + "/custom" + // For backward compatibility + // TODO: drop in 1.1.0 ? + CustomPath = os.Getenv("GOGS_CUSTOM") + if len(CustomPath) == 0 { + CustomPath = workDir + "/custom" + } else { + log.Warn(`Usage of GOGS_CUSTOM is deprecated and will be *removed* in a future release, +please consider changing to GITEA_CUSTOM`) + } } if len(CustomConf) == 0 { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 50cd77f3fb..0fdffad2db 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -687,7 +687,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) HeadRepo: headRepo, BaseRepo: repo, MergeBase: prInfo.MergeBase, - Type: models.PULL_REQUEST_GOGS, + Type: models.PULL_REQUEST_GITEA, } // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. diff --git a/scripts/init/centos/gogs b/scripts/init/centos/gogs index cacf57423a..1a9fc27728 100644 --- a/scripts/init/centos/gogs +++ b/scripts/init/centos/gogs @@ -24,12 +24,12 @@ # Default values NAME=gogs -GOGS_HOME=/home/git/gogs -GOGS_PATH=${GOGS_HOME}/$NAME -GOGS_USER=git +GITEA_HOME=/home/git/gogs +GITEA_PATH=${GITEA_HOME}/$NAME +GITEA_USER=git SERVICENAME="Gogs Go Git Service" LOCKFILE=/var/lock/subsys/gogs -LOGPATH=${GOGS_HOME}/log +LOGPATH=${GITEA_HOME}/log LOGFILE=${LOGPATH}/gogs.log RETVAL=0 @@ -37,19 +37,19 @@ RETVAL=0 [ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME # Don't do anything if nothing is installed -[ -x ${GOGS_PATH} ] || exit 0 +[ -x ${GITEA_PATH} ] || exit 0 # exit if logpath dir is not created. [ -x ${LOGPATH} ] || exit 0 DAEMON_OPTS="--check $NAME" # Set additional options, if any -[ ! -z "$GOGS_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GOGS_USER}" +[ ! -z "$GITEA_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GITEA_USER}" start() { - cd ${GOGS_HOME} + cd ${GITEA_HOME} echo -n "Starting ${SERVICENAME}: " - daemon $DAEMON_OPTS "${GOGS_PATH} web > ${LOGFILE} 2>&1 &" + daemon $DAEMON_OPTS "${GITEA_PATH} web > ${LOGFILE} 2>&1 &" RETVAL=$? echo [ $RETVAL = 0 ] && touch ${LOCKFILE} @@ -58,7 +58,7 @@ start() { } stop() { - cd ${GOGS_HOME} + cd ${GITEA_HOME} echo -n "Shutting down ${SERVICENAME}: " killproc ${NAME} RETVAL=$? diff --git a/scripts/init/freebsd/gogs b/scripts/init/freebsd/gogs index eb57157476..8fc0359eff 100644 --- a/scripts/init/freebsd/gogs +++ b/scripts/init/freebsd/gogs @@ -38,7 +38,7 @@ gogs_start() { gogs_stop() { if [ ! -f $pidfile ]; then - echo "GOGS PID File not found. Maybe GOGS is not running?" + echo "GITEA PID File not found. Maybe GITEA is not running?" else kill $(cat $pidfile) fi diff --git a/scripts/init/suse/gogs b/scripts/init/suse/gogs index ea7dfa0a6e..da5f795807 100644 --- a/scripts/init/suse/gogs +++ b/scripts/init/suse/gogs @@ -18,12 +18,12 @@ # Default values NAME=gogs -GOGS_HOME=/home/git/gogs -GOGS_PATH=${GOGS_HOME}/$NAME -GOGS_USER=git +GITEA_HOME=/home/git/gogs +GITEA_PATH=${GITEA_HOME}/$NAME +GITEA_USER=git SERVICENAME="Go Git Service" LOCKFILE=/var/lock/subsys/gogs -LOGPATH=${GOGS_HOME}/log +LOGPATH=${GITEA_HOME}/log LOGFILE=${LOGPATH}/error.log # gogs creates its own gogs.log from stdout RETVAL=0 @@ -32,7 +32,7 @@ RETVAL=0 [ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME # Don't do anything if nothing is installed -test -x ${GOGS_PATH} || { echo "$NAME not installed"; +test -x ${GITEA_PATH} || { echo "$NAME not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } @@ -53,12 +53,12 @@ case "$1" in echo -n "Starting ${SERVICENAME} " # As we can't use startproc, we have to check ourselves if the service is already running - /sbin/checkproc ${GOGS_PATH} + /sbin/checkproc ${GITEA_PATH} if [ $? -eq 0 ]; then # return skipped as service is already running (exit 5) else - su - ${GOGS_USER} -c "USER=${GOGS_USER} ${GOGS_PATH} web 2>&1 >>${LOGFILE} &" + su - ${GITEA_USER} -c "USER=${GITEA_USER} ${GITEA_PATH} web 2>&1 >>${LOGFILE} &" fi # Remember status and be verbose @@ -70,7 +70,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - /sbin/killproc ${GOGS_PATH} + /sbin/killproc ${GITEA_PATH} # Remember status and be verbose rc_status -v @@ -100,7 +100,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc ${GOGS_PATH} + /sbin/checkproc ${GITEA_PATH} # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v -- cgit v1.2.3 From 145ab5c89a626f9ef0c289bdf6b83826339e482a Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 7 Nov 2016 12:54:17 +0100 Subject: Rename and update init files to use "gitea" instead of "gogs" Closes #102 --- scripts/init/centos/gitea | 93 +++++++++++++++++++++++++++ scripts/init/centos/gogs | 93 --------------------------- scripts/init/debian/gitea | 126 +++++++++++++++++++++++++++++++++++++ scripts/init/debian/gogs | 126 ------------------------------------- scripts/init/freebsd/gitea | 47 ++++++++++++++ scripts/init/freebsd/gogs | 47 -------------- scripts/init/openbsd/gitea | 19 ++++++ scripts/init/openbsd/gogs | 19 ------ scripts/init/suse/gitea | 115 +++++++++++++++++++++++++++++++++ scripts/init/suse/gogs | 115 --------------------------------- scripts/launchd/io.gitea.web.plist | 39 ++++++++++++ scripts/launchd/io.gogs.web.plist | 39 ------------ scripts/supervisor/gitea | 16 +++++ scripts/supervisor/gogs | 16 ----- scripts/systemd/gitea.service | 26 ++++++++ scripts/systemd/gogs.service | 26 -------- 16 files changed, 481 insertions(+), 481 deletions(-) create mode 100644 scripts/init/centos/gitea delete mode 100644 scripts/init/centos/gogs create mode 100644 scripts/init/debian/gitea delete mode 100644 scripts/init/debian/gogs create mode 100644 scripts/init/freebsd/gitea delete mode 100644 scripts/init/freebsd/gogs create mode 100755 scripts/init/openbsd/gitea delete mode 100755 scripts/init/openbsd/gogs create mode 100644 scripts/init/suse/gitea delete mode 100644 scripts/init/suse/gogs create mode 100644 scripts/launchd/io.gitea.web.plist delete mode 100644 scripts/launchd/io.gogs.web.plist create mode 100644 scripts/supervisor/gitea delete mode 100644 scripts/supervisor/gogs create mode 100644 scripts/systemd/gitea.service delete mode 100644 scripts/systemd/gogs.service diff --git a/scripts/init/centos/gitea b/scripts/init/centos/gitea new file mode 100644 index 0000000000..77c720271f --- /dev/null +++ b/scripts/init/centos/gitea @@ -0,0 +1,93 @@ +#!/bin/sh +# +# /etc/rc.d/init.d/gitea +# +# Runs the Gogs Go Git Service. +# +# +# chkconfig: - 85 15 +# + +### BEGIN INIT INFO +# Provides: gitea +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start gitea at boot time. +# Description: Control gitea. +### END INIT INFO + +# Source function library. +. /etc/init.d/functions + +# Default values + +NAME=gitea +GITEA_HOME=/home/git/gitea +GITEA_PATH=${GITEA_HOME}/$NAME +GITEA_USER=git +SERVICENAME="Gogs Go Git Service" +LOCKFILE=/var/lock/subsys/gitea +LOGPATH=${GITEA_HOME}/log +LOGFILE=${LOGPATH}/gitea.log +RETVAL=0 + +# Read configuration from /etc/sysconfig/gitea to override defaults +[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME + +# Don't do anything if nothing is installed +[ -x ${GITEA_PATH} ] || exit 0 +# exit if logpath dir is not created. +[ -x ${LOGPATH} ] || exit 0 + +DAEMON_OPTS="--check $NAME" + +# Set additional options, if any +[ ! -z "$GITEA_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GITEA_USER}" + +start() { + cd ${GITEA_HOME} + echo -n "Starting ${SERVICENAME}: " + daemon $DAEMON_OPTS "${GITEA_PATH} web > ${LOGFILE} 2>&1 &" + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${LOCKFILE} + + return $RETVAL +} + +stop() { + cd ${GITEA_HOME} + echo -n "Shutting down ${SERVICENAME}: " + killproc ${NAME} + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${LOCKFILE} +} + +case "$1" in + start) + status ${NAME} > /dev/null 2>&1 && exit 0 + start + ;; + stop) + stop + ;; + status) + status ${NAME} + ;; + restart) + stop + start + ;; + reload) + stop + start + ;; + *) + echo "Usage: ${NAME} {start|stop|status|restart}" + exit 1 + ;; +esac +exit $RETVAL diff --git a/scripts/init/centos/gogs b/scripts/init/centos/gogs deleted file mode 100644 index 1a9fc27728..0000000000 --- a/scripts/init/centos/gogs +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/init.d/gogs -# -# Runs the Gogs Go Git Service. -# -# -# chkconfig: - 85 15 -# - -### BEGIN INIT INFO -# Provides: gogs -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start gogs at boot time. -# Description: Control gogs. -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -# Default values - -NAME=gogs -GITEA_HOME=/home/git/gogs -GITEA_PATH=${GITEA_HOME}/$NAME -GITEA_USER=git -SERVICENAME="Gogs Go Git Service" -LOCKFILE=/var/lock/subsys/gogs -LOGPATH=${GITEA_HOME}/log -LOGFILE=${LOGPATH}/gogs.log -RETVAL=0 - -# Read configuration from /etc/sysconfig/gogs to override defaults -[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME - -# Don't do anything if nothing is installed -[ -x ${GITEA_PATH} ] || exit 0 -# exit if logpath dir is not created. -[ -x ${LOGPATH} ] || exit 0 - -DAEMON_OPTS="--check $NAME" - -# Set additional options, if any -[ ! -z "$GITEA_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GITEA_USER}" - -start() { - cd ${GITEA_HOME} - echo -n "Starting ${SERVICENAME}: " - daemon $DAEMON_OPTS "${GITEA_PATH} web > ${LOGFILE} 2>&1 &" - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${LOCKFILE} - - return $RETVAL -} - -stop() { - cd ${GITEA_HOME} - echo -n "Shutting down ${SERVICENAME}: " - killproc ${NAME} - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${LOCKFILE} -} - -case "$1" in - start) - status ${NAME} > /dev/null 2>&1 && exit 0 - start - ;; - stop) - stop - ;; - status) - status ${NAME} - ;; - restart) - stop - start - ;; - reload) - stop - start - ;; - *) - echo "Usage: ${NAME} {start|stop|status|restart}" - exit 1 - ;; -esac -exit $RETVAL diff --git a/scripts/init/debian/gitea b/scripts/init/debian/gitea new file mode 100644 index 0000000000..f822edf5ac --- /dev/null +++ b/scripts/init/debian/gitea @@ -0,0 +1,126 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: gitea +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: A self-hosted Git service written in Go. +# Description: A self-hosted Git service written in Go. +### END INIT INFO + +# Author: Danny Boisvert + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Go Git Service" +NAME=gitea +SERVICEVERBOSE=yes +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +WORKINGDIR=/home/git/gitea +DAEMON=$WORKINGDIR/$NAME +DAEMON_ARGS="web" +USER=git + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ + --test --chdir $WORKINGDIR --chuid $USER \\ + --exec $DAEMON -- $DAEMON_ARGS > /dev/null \\ + || return 1" + sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ + --background --chdir $WORKINGDIR --chuid $USER \\ + --exec $DAEMON -- $DAEMON_ARGS \\ + || return 2" +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 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/1/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + 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 + return "$RETVAL" +} + + +case "$1" in + start) + [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/scripts/init/debian/gogs b/scripts/init/debian/gogs deleted file mode 100644 index 187e23a96c..0000000000 --- a/scripts/init/debian/gogs +++ /dev/null @@ -1,126 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: gogs -# Required-Start: $syslog $network -# Required-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: A self-hosted Git service written in Go. -# Description: A self-hosted Git service written in Go. -### END INIT INFO - -# Author: Danny Boisvert - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Go Git Service" -NAME=gogs -SERVICEVERBOSE=yes -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -WORKINGDIR=/home/git/gogs -DAEMON=$WORKINGDIR/$NAME -DAEMON_ARGS="web" -USER=git - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ - --test --chdir $WORKINGDIR --chuid $USER \\ - --exec $DAEMON -- $DAEMON_ARGS > /dev/null \\ - || return 1" - sh -c "USER=$USER start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\ - --background --chdir $WORKINGDIR --chuid $USER \\ - --exec $DAEMON -- $DAEMON_ARGS \\ - || return 2" -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 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/1/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - 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 - return "$RETVAL" -} - - -case "$1" in - start) - [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$SERVICEVERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$SERVICEVERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$SERVICEVERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/scripts/init/freebsd/gitea b/scripts/init/freebsd/gitea new file mode 100644 index 0000000000..898606f35f --- /dev/null +++ b/scripts/init/freebsd/gitea @@ -0,0 +1,47 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: gitea +# REQUIRE: NETWORKING SYSLOG +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable gitea: +# +#gitea_enable="YES" + +. /etc/rc.subr + +name="gitea" +rcvar="gitea_enable" + +load_rc_config $name + +: ${gitea_user:="git"} +: ${gitea_enable:="NO"} +: ${gitea_directory:="/home/git"} + +command="${gitea_directory}/gitea web" +procname="$(echo $command |cut -d' ' -f1)" + +pidfile="${gitea_directory}/${name}.pid" + +start_cmd="${name}_start" +stop_cmd="${name}_stop" + +gitea_start() { + cd ${gitea_directory} + export USER=${gitea_user} + export HOME=/usr/home/${gitea_user} + /usr/sbin/daemon -f -u ${gitea_user} -p ${pidfile} $command +} + +gitea_stop() { + if [ ! -f $pidfile ]; then + echo "GITEA PID File not found. Maybe GITEA is not running?" + else + kill $(cat $pidfile) + fi +} + +run_rc_command "$1" diff --git a/scripts/init/freebsd/gogs b/scripts/init/freebsd/gogs deleted file mode 100644 index 8fc0359eff..0000000000 --- a/scripts/init/freebsd/gogs +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: gogs -# REQUIRE: NETWORKING SYSLOG -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable gogs: -# -#gogs_enable="YES" - -. /etc/rc.subr - -name="gogs" -rcvar="gogs_enable" - -load_rc_config $name - -: ${gogs_user:="git"} -: ${gogs_enable:="NO"} -: ${gogs_directory:="/home/git"} - -command="${gogs_directory}/gogs web" -procname="$(echo $command |cut -d' ' -f1)" - -pidfile="${gogs_directory}/${name}.pid" - -start_cmd="${name}_start" -stop_cmd="${name}_stop" - -gogs_start() { - cd ${gogs_directory} - export USER=${gogs_user} - export HOME=/usr/home/${gogs_user} - /usr/sbin/daemon -f -u ${gogs_user} -p ${pidfile} $command -} - -gogs_stop() { - if [ ! -f $pidfile ]; then - echo "GITEA PID File not found. Maybe GITEA is not running?" - else - kill $(cat $pidfile) - fi -} - -run_rc_command "$1" diff --git a/scripts/init/openbsd/gitea b/scripts/init/openbsd/gitea new file mode 100755 index 0000000000..c43190b558 --- /dev/null +++ b/scripts/init/openbsd/gitea @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="/home/git/gitea/gitea" +daemon_user="git" +daemon_flags="web" + +gitea_directory="/home/git/gitea" + +rc_bg=YES + +. /etc/rc.d/rc.subr + +rc_start() { + ${rcexec} "cd ${gitea_directory}; ${daemon} ${daemon_flags} ${_bg}" +} + +rc_cmd $1 diff --git a/scripts/init/openbsd/gogs b/scripts/init/openbsd/gogs deleted file mode 100755 index 95fcf16965..0000000000 --- a/scripts/init/openbsd/gogs +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# $OpenBSD$ - -daemon="/home/git/gogs/gogs" -daemon_user="git" -daemon_flags="web" - -gogs_directory="/home/git/gogs" - -rc_bg=YES - -. /etc/rc.d/rc.subr - -rc_start() { - ${rcexec} "cd ${gogs_directory}; ${daemon} ${daemon_flags} ${_bg}" -} - -rc_cmd $1 diff --git a/scripts/init/suse/gitea b/scripts/init/suse/gitea new file mode 100644 index 0000000000..7f7d675aa1 --- /dev/null +++ b/scripts/init/suse/gitea @@ -0,0 +1,115 @@ +#!/bin/sh +# +# /etc/init.d/gitea +# +# Runs the Gogs Go Git Service. +# + +### BEGIN INIT INFO +# Provides: gitea +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start gitea at boot time. +# Description: Control gitea. +### END INIT INFO + +# Default values + +NAME=gitea +GITEA_HOME=/home/git/gitea +GITEA_PATH=${GITEA_HOME}/$NAME +GITEA_USER=git +SERVICENAME="Go Git Service" +LOCKFILE=/var/lock/subsys/gitea +LOGPATH=${GITEA_HOME}/log +LOGFILE=${LOGPATH}/error.log +# gitea creates its own gitea.log from stdout +RETVAL=0 + +# Read configuration from /etc/sysconfig/gitea to override defaults +[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME + +# Don't do anything if nothing is installed +test -x ${GITEA_PATH} || { echo "$NAME not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + +# exit if logpath dir is not created. +test -r ${LOGPATH} || { echo "$LOGPATH not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + +# Source function library. +. /etc/rc.status + +# Reset status of this service +rc_reset + + +case "$1" in + start) + echo -n "Starting ${SERVICENAME} " + + # As we can't use startproc, we have to check ourselves if the service is already running + /sbin/checkproc ${GITEA_PATH} + if [ $? -eq 0 ]; then + # return skipped as service is already running + (exit 5) + else + su - ${GITEA_USER} -c "USER=${GITEA_USER} ${GITEA_PATH} web 2>&1 >>${LOGFILE} &" + fi + + # Remember status and be verbose + rc_status -v + ;; + + stop) + echo -n "Shutting down ${SERVICENAME} " + + ## Stop daemon with killproc(8) and if this fails + ## killproc sets the return value according to LSB. + /sbin/killproc ${GITEA_PATH} + + # Remember status and be verbose + rc_status -v + ;; + + restart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; + + status) + echo -n "Checking for ${SERVICENAME} " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + + # NOTE: checkproc returns LSB compliant status values. + /sbin/checkproc ${GITEA_PATH} + # NOTE: rc_status knows that we called this init script with + # "status" option and adapts its messages accordingly. + rc_status -v + ;; + + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 + ;; + +esac +rc_exit diff --git a/scripts/init/suse/gogs b/scripts/init/suse/gogs deleted file mode 100644 index da5f795807..0000000000 --- a/scripts/init/suse/gogs +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/gogs -# -# Runs the Gogs Go Git Service. -# - -### BEGIN INIT INFO -# Provides: gogs -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start gogs at boot time. -# Description: Control gogs. -### END INIT INFO - -# Default values - -NAME=gogs -GITEA_HOME=/home/git/gogs -GITEA_PATH=${GITEA_HOME}/$NAME -GITEA_USER=git -SERVICENAME="Go Git Service" -LOCKFILE=/var/lock/subsys/gogs -LOGPATH=${GITEA_HOME}/log -LOGFILE=${LOGPATH}/error.log -# gogs creates its own gogs.log from stdout -RETVAL=0 - -# Read configuration from /etc/sysconfig/gogs to override defaults -[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME - -# Don't do anything if nothing is installed -test -x ${GITEA_PATH} || { echo "$NAME not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# exit if logpath dir is not created. -test -r ${LOGPATH} || { echo "$LOGPATH not existing"; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } - -# Source function library. -. /etc/rc.status - -# Reset status of this service -rc_reset - - -case "$1" in - start) - echo -n "Starting ${SERVICENAME} " - - # As we can't use startproc, we have to check ourselves if the service is already running - /sbin/checkproc ${GITEA_PATH} - if [ $? -eq 0 ]; then - # return skipped as service is already running - (exit 5) - else - su - ${GITEA_USER} -c "USER=${GITEA_USER} ${GITEA_PATH} web 2>&1 >>${LOGFILE} &" - fi - - # Remember status and be verbose - rc_status -v - ;; - - stop) - echo -n "Shutting down ${SERVICENAME} " - - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - /sbin/killproc ${GITEA_PATH} - - # Remember status and be verbose - rc_status -v - ;; - - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - - status) - echo -n "Checking for ${SERVICENAME} " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc ${GITEA_PATH} - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; - - *) - echo "Usage: $0 {start|stop|status|restart}" - exit 1 - ;; - -esac -rc_exit diff --git a/scripts/launchd/io.gitea.web.plist b/scripts/launchd/io.gitea.web.plist new file mode 100644 index 0000000000..6181ea15cd --- /dev/null +++ b/scripts/launchd/io.gitea.web.plist @@ -0,0 +1,39 @@ + + + + + Label + io.gitea.web + + + UserName + git + GroupName + git + ProgramArguments + + + + /Users/git/gitea/gitea + web + + RunAtLoad + + KeepAlive + + + + WorkingDirectory + /Users/git/gitea/ + StandardOutPath + /Users/git/gitea/log/stdout.log + StandardErrorPath + /Users/git/gitea/log/stderr.log + + SoftResourceLimits + + NumberOfFiles + 8192 + + + diff --git a/scripts/launchd/io.gogs.web.plist b/scripts/launchd/io.gogs.web.plist deleted file mode 100644 index 2a5ec7d691..0000000000 --- a/scripts/launchd/io.gogs.web.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Label - io.gogs.web - - - UserName - git - GroupName - git - ProgramArguments - - - - /Users/git/gogs/gogs - web - - RunAtLoad - - KeepAlive - - - - WorkingDirectory - /Users/git/gogs/ - StandardOutPath - /Users/git/gogs/log/stdout.log - StandardErrorPath - /Users/git/gogs/log/stderr.log - - SoftResourceLimits - - NumberOfFiles - 8192 - - - diff --git a/scripts/supervisor/gitea b/scripts/supervisor/gitea new file mode 100644 index 0000000000..a8a908d50b --- /dev/null +++ b/scripts/supervisor/gitea @@ -0,0 +1,16 @@ +[program:gitea] +directory=/home/git/go/src/github.com/go-gitea/gitea/ +command=/home/git/go/src/github.com/go-gitea/gitea/gitea web +autostart=true +autorestart=true +startsecs=10 +stdout_logfile=/var/log/gitea/stdout.log +stdout_logfile_maxbytes=1MB +stdout_logfile_backups=10 +stdout_capture_maxbytes=1MB +stderr_logfile=/var/log/gitea/stderr.log +stderr_logfile_maxbytes=1MB +stderr_logfile_backups=10 +stderr_capture_maxbytes=1MB +user = git +environment = HOME="/home/git", USER="git" \ No newline at end of file diff --git a/scripts/supervisor/gogs b/scripts/supervisor/gogs deleted file mode 100644 index 39323521aa..0000000000 --- a/scripts/supervisor/gogs +++ /dev/null @@ -1,16 +0,0 @@ -[program:gogs] -directory=/home/git/go/src/github.com/go-gitea/gitea/ -command=/home/git/go/src/github.com/go-gitea/gitea/gogs web -autostart=true -autorestart=true -startsecs=10 -stdout_logfile=/var/log/gogs/stdout.log -stdout_logfile_maxbytes=1MB -stdout_logfile_backups=10 -stdout_capture_maxbytes=1MB -stderr_logfile=/var/log/gogs/stderr.log -stderr_logfile_maxbytes=1MB -stderr_logfile_backups=10 -stderr_capture_maxbytes=1MB -user = git -environment = HOME="/home/git", USER="git" \ No newline at end of file diff --git a/scripts/systemd/gitea.service b/scripts/systemd/gitea.service new file mode 100644 index 0000000000..48ef7322f3 --- /dev/null +++ b/scripts/systemd/gitea.service @@ -0,0 +1,26 @@ +[Unit] +Description=Gogs (Go Git Service) +After=syslog.target +After=network.target +#After=mysqld.service +#After=postgresql.service +#After=memcached.service +#After=redis.service + +[Service] +# Modify these two values and uncomment them if you have +# repos with lots of files and get an HTTP error 500 because +# of that +### +#LimitMEMLOCK=infinity +#LimitNOFILE=65535 +Type=simple +User=git +Group=git +WorkingDirectory=/home/git/gitea +ExecStart=/home/git/gitea/gitea web +Restart=always +Environment=USER=git HOME=/home/git + +[Install] +WantedBy=multi-user.target diff --git a/scripts/systemd/gogs.service b/scripts/systemd/gogs.service deleted file mode 100644 index e0db5ecbce..0000000000 --- a/scripts/systemd/gogs.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Gogs (Go Git Service) -After=syslog.target -After=network.target -#After=mysqld.service -#After=postgresql.service -#After=memcached.service -#After=redis.service - -[Service] -# Modify these two values and uncomment them if you have -# repos with lots of files and get an HTTP error 500 because -# of that -### -#LimitMEMLOCK=infinity -#LimitNOFILE=65535 -Type=simple -User=git -Group=git -WorkingDirectory=/home/git/gogs -ExecStart=/home/git/gogs/gogs web -Restart=always -Environment=USER=git HOME=/home/git - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3 From 30be1f48266a0c8bfb080b6df1a4ebee906949b3 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 7 Nov 2016 12:52:55 +0100 Subject: Fix typo in unused constant name --- models/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/pull.go b/models/pull.go index 20ea1b87c5..adb5ab74f0 100644 --- a/models/pull.go +++ b/models/pull.go @@ -27,7 +27,7 @@ type PullRequestType int const ( PULL_REQUEST_GITEA PullRequestType = iota - PLLL_ERQUEST_GIT + PULL_REQUEST_GIT ) type PullRequestStatus int -- cgit v1.2.3