Download as
Browse Code »

Commit 85e784cc1d3d44cdb553bc3be77a3522e6ae4603

Authored by Lyle Entwistle
1 parent 6e1ee1fe
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
config/puma.rb.example
  Diff comments   View file @85e784c
1 #!/usr/bin/env puma 1 #!/usr/bin/env puma
2 2
3 # Start Puma with next command: 3 # Start Puma with next command:
4 -# RAILS_ENV=production bundle exec puma -e production -C ./config/puma.rb 4 +# RAILS_ENV=production bundle exec puma -C ./config/puma.rb
5 5
6 # uncomment and customize to run in non-root path 6 # uncomment and customize to run in non-root path
7 # note that config/gitlab.yml web path should also be changed 7 # note that config/gitlab.yml web path should also be changed
@@ -19,7 +19,7 @@ directory application_path @@ -19,7 +19,7 @@ directory application_path
19 # 19 #
20 # The default is “development”. 20 # The default is “development”.
21 # 21 #
22 -environment = :production 22 +environment 'production'
23 23
24 # Daemonize the server into the background. Highly suggest that 24 # Daemonize the server into the background. Highly suggest that
25 # this be combined with “pidfile” and “stdout_redirect”. 25 # this be combined with “pidfile” and “stdout_redirect”.
lib/support/init.d/gitlab
  Diff comments   View file @85e784c
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 APP_ROOT="/home/git/gitlab" 18 APP_ROOT="/home/git/gitlab"
19 APP_USER="git" 19 APP_USER="git"
20 -DAEMON_OPTS="-C $APP_ROOT/config/puma.rb -e production" 20 +DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
21 PID_PATH="$APP_ROOT/tmp/pids" 21 PID_PATH="$APP_ROOT/tmp/pids"
22 WEB_SERVER_PID="$PID_PATH/puma.pid" 22 WEB_SERVER_PID="$PID_PATH/puma.pid"
23 SIDEKIQ_PID="$PID_PATH/sidekiq.pid" 23 SIDEKIQ_PID="$PID_PATH/sidekiq.pid"