kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed puma.rb environment setting, no need to specify 'production' in daemon options now

This commit is contained in:
Lyle Entwistle 2013-05-09 17:41:00 +01:00
parent 6e1ee1fea6
commit 85e784cc1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/puma.rb.example
View File

@ -1,7 +1,7 @@
#!/usr/bin/env puma
# Start Puma with next command:
# RAILS_ENV=production bundle exec puma -e production -C ./config/puma.rb
# RAILS_ENV=production bundle exec puma -C ./config/puma.rb
# uncomment and customize to run in non-root path
# note that config/gitlab.yml web path should also be changed
@ -19,7 +19,7 @@ directory application_path
#
# The default is “development”.
#
environment = :production
environment 'production'
# Daemonize the server into the background. Highly suggest that
# this be combined with “pidfile” and “stdout_redirect”.

2
lib/support/init.d/gitlab
View File

@ -17,7 +17,7 @@
APP_ROOT="/home/git/gitlab"
APP_USER="git"
DAEMON_OPTS="-C $APP_ROOT/config/puma.rb -e production"
DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
PID_PATH="$APP_ROOT/tmp/pids"
WEB_SERVER_PID="$PID_PATH/puma.pid"
SIDEKIQ_PID="$PID_PATH/sidekiq.pid"