Fix unicorn init and config

diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 00c509d..e010de6 100644 (file)
--- 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 2b26a96..219776c 100644 (file)
--- 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"