summaryrefslogtreecommitdiff
path: root/lib/support/init.d
diff options
context:
space:
mode:
authorRovanion <rovanion.luckey@gmail.com>2013-08-27 15:04:20 +0200
committerRovanion Luckey <rovanion.luckey@gmail.com>2013-08-27 15:05:53 +0200
commit7c38f4e23784b3c141db254059b88cb1044bd946 (patch)
tree9e27943e78825c230a57c5ce009180f6ed82ce93 /lib/support/init.d
parentdf9e1db9040db43eecb9f2a449055a28adfc5707 (diff)
downloadgitlab-ce-7c38f4e23784b3c141db254059b88cb1044bd946.tar.gz
Changes recommended by @axilleas
Diffstat (limited to 'lib/support/init.d')
-rwxr-xr-xlib/support/init.d/gitlab10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index bf405c18cf9..65e036fe984 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -20,8 +20,8 @@ RAILS_ENV="production"
# Script variable names should be lower-case not to conflict with internal
# /bin/sh variables such as PATH, EDITOR or SHELL.
-app_root="/home/gitlab/gitlab"
-app_user="gitlab"
+app_root="/home/git/gitlab"
+app_user="git"
unicorn_conf="$app_root/config/unicorn.rb"
pid_path="$app_root/tmp/pids"
socket_path="$app_root/tmp/sockets"
@@ -68,7 +68,7 @@ check_pids(){
check_pids
-# Checks wether the different parts of the server is already running or not.
+# Checks whether the different parts of the service are already running or not.
check_status(){
check_pids
# If the web server is running kill -0 $wpid returns true, or rather 0.
@@ -117,7 +117,7 @@ start() {
else
echo "Starting the GitLab Unicorn web server..."
# Remove old socket if it exists
- rm -f "$socket_path"/gitlab.socket
+ rm -f "$socket_path"/gitlab.socket 2>/dev/null
# Start the webserver
bundle exec unicorn_rails -D -c "$unicorn_conf" -E "$RAILS_ENV"
fi
@@ -231,4 +231,4 @@ case "$1" in
;;
esac
-exit \ No newline at end of file
+exit