Download as
Browse Code »

Commit 7c38f4e23784b3c141db254059b88cb1044bd946

Authored by Rovanion
Committed by Rovanion Luckey
1 parent df9e1db9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Changes recommended by @axilleas

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
lib/support/init.d/gitlab
  Diff comments   View file @7c38f4e
@@ -20,8 +20,8 @@ RAILS_ENV="production" @@ -20,8 +20,8 @@ RAILS_ENV="production"
20 20
21 # Script variable names should be lower-case not to conflict with internal 21 # Script variable names should be lower-case not to conflict with internal
22 # /bin/sh variables such as PATH, EDITOR or SHELL. 22 # /bin/sh variables such as PATH, EDITOR or SHELL.
23 -app_root="/home/gitlab/gitlab"  
24 -app_user="gitlab" 23 +app_root="/home/git/gitlab"
  24 +app_user="git"
25 unicorn_conf="$app_root/config/unicorn.rb" 25 unicorn_conf="$app_root/config/unicorn.rb"
26 pid_path="$app_root/tmp/pids" 26 pid_path="$app_root/tmp/pids"
27 socket_path="$app_root/tmp/sockets" 27 socket_path="$app_root/tmp/sockets"
@@ -68,7 +68,7 @@ check_pids(){ @@ -68,7 +68,7 @@ check_pids(){
68 check_pids 68 check_pids
69 69
70 70
71 -# Checks wether the different parts of the server is already running or not. 71 +# Checks whether the different parts of the service are already running or not.
72 check_status(){ 72 check_status(){
73 check_pids 73 check_pids
74 # If the web server is running kill -0 $wpid returns true, or rather 0. 74 # If the web server is running kill -0 $wpid returns true, or rather 0.
@@ -117,7 +117,7 @@ start() { @@ -117,7 +117,7 @@ start() {
117 else 117 else
118 echo "Starting the GitLab Unicorn web server..." 118 echo "Starting the GitLab Unicorn web server..."
119 # Remove old socket if it exists 119 # Remove old socket if it exists
120 - rm -f "$socket_path"/gitlab.socket 120 + rm -f "$socket_path"/gitlab.socket 2>/dev/null
121 # Start the webserver 121 # Start the webserver
122 bundle exec unicorn_rails -D -c "$unicorn_conf" -E "$RAILS_ENV" 122 bundle exec unicorn_rails -D -c "$unicorn_conf" -E "$RAILS_ENV"
123 fi 123 fi
@@ -231,4 +231,4 @@ case "$1" in @@ -231,4 +231,4 @@ case "$1" in
231 ;; 231 ;;
232 esac 232 esac
233 233
234 -exit  
235 \ No newline at end of file 234 \ No newline at end of file
  235 +exit