[DRE-commits] [gitlab] 03/17: use ENV for setting variables

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 92b29bd03f0b4bc0e61bfff67d69ebdff361a505
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Feb 13 17:59:07 2016 +0530

    use ENV for setting variables
---
 debian/conf/unicorn.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/conf/unicorn.rb b/debian/conf/unicorn.rb
index 59c124a..b8c7940 100644
--- a/debian/conf/unicorn.rb
+++ b/debian/conf/unicorn.rb
@@ -30,12 +30,12 @@ worker_processes 3
 
 # Help ensure your application will always spawn in the symlinked
 # "current" directory that Capistrano sets up.
-working_directory "/usr/share/gitlab" # available in 0.94.0+
+working_directory ENV['gitlab_home'] # available in 0.94.0+
 
 # Listen on both a Unix domain socket and a TCP port.
 # If you are load-balancing multiple Unicorn masters, lower the backlog
 # setting to e.g. 64 for faster failover.
-listen "/usr/share/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
+listen "#{ENV['gitlab_pid_path']}/pids/gitlab.socket", :backlog => 1024
 listen "127.0.0.1:8080", :tcp_nopush => true
 
 # nuke workers after 30 seconds instead of 60 seconds (the default)
@@ -56,13 +56,13 @@ listen "127.0.0.1:8080", :tcp_nopush => true
 timeout 60
 
 # feel free to point this anywhere accessible on the filesystem
-pid "/usr/share/gitlab/tmp/pids/unicorn.pid"
+pid "#{ENV['gitlab_pid_path']}/pids/unicorn.pid"
 
 # By default, the Unicorn logger will write to stderr.
 # Additionally, some applications/frameworks log to stderr or stdout,
 # so prevent them from going to /dev/null when daemonized here:
-stderr_path "/usr/share/gitlab/log/unicorn.stderr.log"
-stdout_path "/usr/share/gitlab/log/unicorn.stdout.log"
+stderr_path File.join(ENV['gitlab_log_dir'],"unicorn.stderr.log")
+stdout_path File.join(ENV['gitlab_log_dir'],"unicorn.stdout.log")
 
 # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
 # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git