summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorLyle Entwistle <lyleentwistle@preloaded.com>2013-05-09 17:41:00 +0100
committerLyle Entwistle <lyleentwistle@preloaded.com>2013-05-09 17:41:00 +0100
commit85e784cc1d3d44cdb553bc3be77a3522e6ae4603 (patch)
treef4f2d8df3cf0c899e239a1b3ba30cdde0d18969b /config
parent6e1ee1fea6400c3621005f1b79e1b8dab43cd000 (diff)
downloadgitlab-ce-85e784cc1d3d44cdb553bc3be77a3522e6ae4603.tar.gz
Fixed puma.rb environment setting, no need to specify 'production' in daemon options now
Diffstat (limited to 'config')
-rw-r--r--config/puma.rb.example4
1 files changed, 2 insertions, 2 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”.