summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 19:28:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 19:28:59 +0300
commit967d42e0c8701c82d7d7494b1fd1d96cd4f2973f (patch)
tree64cabf4d9c292546f8e129ecafa0a81dcf721c30
parent87f4e1f153ef763bbdbd614f3c9e1f2ea4798830 (diff)
downloadgitlab-ce-967d42e0c8701c82d7d7494b1fd1d96cd4f2973f.tar.gz
Fix unicorn init and config
-rw-r--r--config/unicorn.rb.example2
-rw-r--r--lib/support/init.d/gitlab_unicorn2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 00c509dd829..e010de6d6a9 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -21,7 +21,7 @@ worker_processes 2
# Help ensure your application will always spawn in the symlinked
# "current" directory that Capistrano sets up.
-working_directory "/home/git/gitlab/current" # available in 0.94.0+
+working_directory "/home/git/gitlab" # available in 0.94.0+
# listen on both a Unix domain socket and a TCP port,
# we use a shorter backlog for quicker failover when busy
diff --git a/lib/support/init.d/gitlab_unicorn b/lib/support/init.d/gitlab_unicorn
index 2b26a962a8a..219776c8684 100644
--- a/lib/support/init.d/gitlab_unicorn
+++ b/lib/support/init.d/gitlab_unicorn
@@ -17,7 +17,7 @@
APP_ROOT="/home/git/gitlab"
APP_USER="git"
-DAEMON_OPTS="-C $APP_ROOT/config/unicorn.rb -E production"
+DAEMON_OPTS="-c $APP_ROOT/config/unicorn.rb -E production"
PID_PATH="$APP_ROOT/tmp/pids"
SOCKET_PATH="$APP_ROOT/tmp/sockets"
WEB_SERVER_PID="$PID_PATH/unicorn.pid"