mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Replace GOGS with GITEA in variable names

Browse Source 
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
pull/103/head
Sandro Santilli 8 years ago
parent 1b962bac0b
commit b7263f31a5
10 changed files with 44 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Dockerfile
  2. 2
      Dockerfile.rpi
  3. 2
      docker/build.sh
  4. 2
      docker/s6/gogs/setup
  5. 2
      models/pull.go
  6. 18
      modules/setting/setting.go
  7. 2
      routers/repo/pull.go
  8. 18
      scripts/init/centos/gogs
  9. 2
      scripts/init/freebsd/gogs
  10. 18
      scripts/init/suse/gogs

2
Dockerfile
Unescape View File

@ -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 \ RUN chmod +x /usr/sbin/gosu \
&& apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat tzdata && 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/ COPY . /app/gogs/
WORKDIR /app/gogs/ WORKDIR /app/gogs/

2
Dockerfile.rpi
Unescape View File

@ -9,7 +9,7 @@ RUN chmod +x /usr/sbin/gosu \
&& apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \ && 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 && 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/ COPY . /app/gogs/
WORKDIR /app/gogs/ WORKDIR /app/gogs/

2
docker/build.sh
Unescape View File

@ -33,4 +33,4 @@ apk --no-progress del build-deps
# Create git user for Gogs # Create git user for Gogs
adduser -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && passwd -u git 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

2
docker/s6/gogs/setup
Unescape View File

@ -6,7 +6,7 @@ if ! test -d ~git/.ssh; then
fi fi
if ! test -f ~git/.ssh/environment; then 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 chmod 600 ~git/.ssh/environment
fi fi

2
models/pull.go
Unescape View File

@ -26,7 +26,7 @@ var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLe
type PullRequestType int type PullRequestType int
const ( const (
PULL_REQUEST_GOGS PullRequestType = iota PULL_REQUEST_GITEA PullRequestType = iota
PLLL_ERQUEST_GIT PLLL_ERQUEST_GIT
) )

18
modules/setting/setting.go
Unescape View File

@ -297,10 +297,18 @@ func init() {
// WorkDir returns absolute path of work directory. // WorkDir returns absolute path of work directory.
func WorkDir() (string, error) { func WorkDir() (string, error) {
wd := os.Getenv("GOGS_WORK_DIR") wd := os.Getenv("GITEA_WORK_DIR")
if len(wd) > 0 { if len(wd) > 0 {
return wd, nil 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, "/") i := strings.LastIndex(AppPath, "/")
if i == -1 { if i == -1 {
@ -341,9 +349,17 @@ func NewContext() {
log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err)
} }
CustomPath = os.Getenv("GITEA_CUSTOM")
if len(CustomPath) == 0 {
// For backward compatibility
// TODO: drop in 1.1.0 ?
CustomPath = os.Getenv("GOGS_CUSTOM") CustomPath = os.Getenv("GOGS_CUSTOM")
if len(CustomPath) == 0 { if len(CustomPath) == 0 {
CustomPath = workDir + "/custom" 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 { if len(CustomConf) == 0 {

2
routers/repo/pull.go
Unescape View File

@ -687,7 +687,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm)
HeadRepo: headRepo, HeadRepo: headRepo,
BaseRepo: repo, BaseRepo: repo,
MergeBase: prInfo.MergeBase, 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 // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt
// instead of 500. // instead of 500.

18
scripts/init/centos/gogs
Unescape View File

@ -24,12 +24,12 @@
# Default values # Default values
NAME=gogs NAME=gogs
GOGS_HOME=/home/git/gogs GITEA_HOME=/home/git/gogs
GOGS_PATH=${GOGS_HOME}/$NAME GITEA_PATH=${GITEA_HOME}/$NAME
GOGS_USER=git GITEA_USER=git
SERVICENAME="Gogs Go Git Service" SERVICENAME="Gogs Go Git Service"
LOCKFILE=/var/lock/subsys/gogs LOCKFILE=/var/lock/subsys/gogs
LOGPATH=${GOGS_HOME}/log LOGPATH=${GITEA_HOME}/log
LOGFILE=${LOGPATH}/gogs.log LOGFILE=${LOGPATH}/gogs.log
RETVAL=0 RETVAL=0
@ -37,19 +37,19 @@ RETVAL=0
[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME [ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
# Don't do anything if nothing is installed # 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. # exit if logpath dir is not created.
[ -x ${LOGPATH} ] || exit 0 [ -x ${LOGPATH} ] || exit 0
DAEMON_OPTS="--check $NAME" DAEMON_OPTS="--check $NAME"
# Set additional options, if any # 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() { start() {
cd ${GOGS_HOME} cd ${GITEA_HOME}
echo -n "Starting ${SERVICENAME}: " echo -n "Starting ${SERVICENAME}: "
daemon $DAEMON_OPTS "${GOGS_PATH} web > ${LOGFILE} 2>&1 &" daemon $DAEMON_OPTS "${GITEA_PATH} web > ${LOGFILE} 2>&1 &"
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL = 0 ] && touch ${LOCKFILE} [ $RETVAL = 0 ] && touch ${LOCKFILE}
@ -58,7 +58,7 @@ start() {
} }
stop() { stop() {
cd ${GOGS_HOME} cd ${GITEA_HOME}
echo -n "Shutting down ${SERVICENAME}: " echo -n "Shutting down ${SERVICENAME}: "
killproc ${NAME} killproc ${NAME}
RETVAL=$? RETVAL=$?

2
scripts/init/freebsd/gogs
Unescape View File

@ -38,7 +38,7 @@ gogs_start() {
gogs_stop() { gogs_stop() {
if [ ! -f $pidfile ]; then 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 else
kill $(cat $pidfile) kill $(cat $pidfile)
fi fi

18
scripts/init/suse/gogs
Unescape View File

@ -18,12 +18,12 @@
# Default values # Default values
NAME=gogs NAME=gogs
GOGS_HOME=/home/git/gogs GITEA_HOME=/home/git/gogs
GOGS_PATH=${GOGS_HOME}/$NAME GITEA_PATH=${GITEA_HOME}/$NAME
GOGS_USER=git GITEA_USER=git
SERVICENAME="Go Git Service" SERVICENAME="Go Git Service"
LOCKFILE=/var/lock/subsys/gogs LOCKFILE=/var/lock/subsys/gogs
LOGPATH=${GOGS_HOME}/log LOGPATH=${GITEA_HOME}/log
LOGFILE=${LOGPATH}/error.log LOGFILE=${LOGPATH}/error.log
# gogs creates its own gogs.log from stdout # gogs creates its own gogs.log from stdout
RETVAL=0 RETVAL=0
@ -32,7 +32,7 @@ RETVAL=0
[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME [ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
# Don't do anything if nothing is installed # 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; if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; } else exit 5; fi; }
@ -53,12 +53,12 @@ case "$1" in
echo -n "Starting ${SERVICENAME} " echo -n "Starting ${SERVICENAME} "
# As we can't use startproc, we have to check ourselves if the service is already running # 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 if [ $? -eq 0 ]; then
# return skipped as service is already running # return skipped as service is already running
(exit 5) (exit 5)
else 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 fi
# Remember status and be verbose # Remember status and be verbose
@ -70,7 +70,7 @@ case "$1" in
## Stop daemon with killproc(8) and if this fails ## Stop daemon with killproc(8) and if this fails
## killproc sets the return value according to LSB. ## killproc sets the return value according to LSB.
/sbin/killproc ${GOGS_PATH} /sbin/killproc ${GITEA_PATH}
# Remember status and be verbose # Remember status and be verbose
rc_status -v rc_status -v
@ -100,7 +100,7 @@ case "$1" in
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values. # 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 # NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly. # "status" option and adapts its messages accordingly.
rc_status -v rc_status -v

Write Preview
Loading…
Cancel
Save