diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-13 09:10:22 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-13 09:10:22 -0700 |
| commit | 81e6029406234267982d3516087133e215952e5e (patch) | |
| tree | f0b16bea26a8f74ec628550c909fe038d415f26c | |
| parent | 419d1eac1fa3731810b551ef89f2c3d4c9cdbd92 (diff) | |
| parent | 85e784cc1d3d44cdb553bc3be77a3522e6ae4603 (diff) | |
| download | gitlab-ce-81e6029406234267982d3516087133e215952e5e.tar.gz | |
Merge pull request #3897 from LyleE/puma-config-environment-fix
Fixed puma.rb environment setting
| -rw-r--r-- | config/puma.rb.example | 4 | ||||
| -rw-r--r-- | lib/support/init.d/gitlab | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/puma.rb.example b/config/puma.rb.example index b1562215c1d..ad5e3e23501 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -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”. diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 9c922f85b6a..47996594e3b 100644 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -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" |