From de154f3ef1a24522deb05138ba73cdaf9be00cd1 Mon Sep 17 00:00:00 2001
From: Michael Berg <berg@taktsoft.com>
Date: Fri, 1 Mar 2013 23:55:49 +0100
Subject: [PATCH 1/2] Get secret_token from ENV['SECRET_TOKEN'] (e.g. for
 Heroku)

---
 config/initializers/secret_token.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 857e80e30..73cf11895 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -13,6 +13,9 @@
 if Rails.env.test? || Rails.env.development?
   Discourse::Application.config.secret_token = "47f5390004bf6d25bb97083fb98e7cc133ab450ba814dd19638a78282b4ca291"
 else
-  raise "You must set a secret token in config/initializers/secret_token.rb"
+  if Rails.env.production? && ENV['SECRET_TOKEN'].blank?
+    raise 'SECRET_TOKEN environment variable must be set!'
+  end
+  Discourse::Application.config.secret_token = ENV['SECRET_TOKEN']
 end
 

From 5e95dfb1c98d13a3fbfc6af5fceaf4a4306c830e Mon Sep 17 00:00:00 2001
From: Michael Berg <berg@taktsoft.com>
Date: Sat, 2 Mar 2013 05:58:05 +0100
Subject: [PATCH 2/2] Removing unnecessary Rails.env check

---
 config/initializers/secret_token.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 73cf11895..00934ec07 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -13,9 +13,7 @@
 if Rails.env.test? || Rails.env.development?
   Discourse::Application.config.secret_token = "47f5390004bf6d25bb97083fb98e7cc133ab450ba814dd19638a78282b4ca291"
 else
-  if Rails.env.production? && ENV['SECRET_TOKEN'].blank?
-    raise 'SECRET_TOKEN environment variable must be set!'
-  end
+  raise "You must set a secret token in ENV['SECRET_TOKEN'] or in config/initializers/secret_token.rb" if ENV['SECRET_TOKEN'].blank?
   Discourse::Application.config.secret_token = ENV['SECRET_TOKEN']
 end