Merge branch 'master' into 6-0-dev
Conflicts: VERSION
This commit is contained in:
commit
92ef845fa5
2 changed files with 10 additions and 3 deletions
|
@ -26,6 +26,11 @@ v 5.4.0
|
||||||
- Misspelling fixes
|
- Misspelling fixes
|
||||||
- Added support of unicorn and fog gems
|
- Added support of unicorn and fog gems
|
||||||
- Added client list to API doc
|
- Added client list to API doc
|
||||||
|
- Fix PostgreSQL database restoration problem
|
||||||
|
- Increase snippet content column size
|
||||||
|
- allow project import via git:// url
|
||||||
|
- Show participants on issues, including mentions
|
||||||
|
- Notify mentioned users with email
|
||||||
|
|
||||||
v 5.3.0
|
v 5.3.0
|
||||||
- Refactored services
|
- Refactored services
|
||||||
|
|
|
@ -20,6 +20,7 @@ APP_USER="git"
|
||||||
DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
|
DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
|
||||||
PID_PATH="$APP_ROOT/tmp/pids"
|
PID_PATH="$APP_ROOT/tmp/pids"
|
||||||
SOCKET_PATH="$APP_ROOT/tmp/sockets"
|
SOCKET_PATH="$APP_ROOT/tmp/sockets"
|
||||||
|
SOCKET_FILE="$SOCKET_PATH/gitlab.socket"
|
||||||
WEB_SERVER_PID="$PID_PATH/puma.pid"
|
WEB_SERVER_PID="$PID_PATH/puma.pid"
|
||||||
SIDEKIQ_PID="$PID_PATH/sidekiq.pid"
|
SIDEKIQ_PID="$PID_PATH/sidekiq.pid"
|
||||||
STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop"
|
STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop"
|
||||||
|
@ -51,7 +52,7 @@ start() {
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
if [ `whoami` = root ]; then
|
if [ `whoami` = root ]; then
|
||||||
execute "rm -f $SOCKET_PATH/gitlab.socket"
|
! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE"
|
||||||
execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS"
|
execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS"
|
||||||
execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
|
execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
|
||||||
echo "$DESC started"
|
echo "$DESC started"
|
||||||
|
@ -65,12 +66,13 @@ stop() {
|
||||||
if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
|
if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
|
||||||
## Program is running, stop it.
|
## Program is running, stop it.
|
||||||
kill -QUIT `cat $WEB_SERVER_PID`
|
kill -QUIT `cat $WEB_SERVER_PID`
|
||||||
|
! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE"
|
||||||
execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &"
|
execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &"
|
||||||
rm "$WEB_SERVER_PID" >> /dev/null
|
rm "$WEB_SERVER_PID" >> /dev/null
|
||||||
echo "$DESC stopped"
|
echo "$DESC stopped"
|
||||||
else
|
else
|
||||||
## Program is not running, exit with error.
|
## Program is not running, exit with error.
|
||||||
echo "Error! $DESC not started!"
|
echo "Error! $DESC is not started!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -81,7 +83,7 @@ restart() {
|
||||||
if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
|
if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
|
||||||
echo "Restarting $DESC..."
|
echo "Restarting $DESC..."
|
||||||
kill -USR2 `cat $WEB_SERVER_PID`
|
kill -USR2 `cat $WEB_SERVER_PID`
|
||||||
execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &"
|
execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1"
|
||||||
if [ `whoami` = root ]; then
|
if [ `whoami` = root ]; then
|
||||||
execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
|
execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue