diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-28 17:08:21 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-28 17:09:01 +0300 |
commit | df67b25bc2c56b59758bdf5dfcab6ff0946632d7 (patch) | |
tree | 9690b4a03a4167aa288e8921e636d4ef8071e2f5 /lib/support | |
parent | 1ed92561b232a4f2546da39bd8d14228f6d082c5 (diff) | |
download | gitlab-ce-df67b25bc2c56b59758bdf5dfcab6ff0946632d7.tar.gz |
init.d: Ensure socket is removed before starting service
Diffstat (limited to 'lib/support')
-rw-r--r-- | lib/support/init.d/gitlab | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 4c5499bbf23..f4ca07b3676 100644 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -2,7 +2,7 @@ # GITLAB # Maintainer: @randx -# App Version: 5.1 +# App Version: 5.2 ### BEGIN INIT INFO # Provides: gitlab @@ -19,6 +19,7 @@ APP_ROOT="/home/git/gitlab" APP_USER="git" DAEMON_OPTS="-C $APP_ROOT/config/puma.rb" PID_PATH="$APP_ROOT/tmp/pids" +SOCKET_PATH="$APP_ROOT/tmp/sockets" WEB_SERVER_PID="$PID_PATH/puma.pid" SIDEKIQ_PID="$PID_PATH/sidekiq.pid" STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop" @@ -50,6 +51,7 @@ start() { exit 1 else if [ `whoami` = root ]; then + execute "rm $SOCKET_PATH/gitlab.socket" execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS" execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" echo "$DESC started" |