From 85e784cc1d3d44cdb553bc3be77a3522e6ae4603 Mon Sep 17 00:00:00 2001
From: Lyle Entwistle <lyleentwistle@preloaded.com>
Date: Thu, 9 May 2013 17:41:00 +0100
Subject: [PATCH] Fixed puma.rb environment setting, no need to specify
 'production' in daemon options now

---
 config/puma.rb.example    | 4 ++--
 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 b1562215c..ad5e3e235 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 9c922f85b..47996594e 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"
-- 
2.11.0