consolidate secret setup

marcosvm · Mar 19, 2012 · d549a57 · d549a57
1 parent b2f691f
commit d549a57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/config/environments/maintenance.rb b/config/environments/maintenance.rb
@@ -12,5 +12,3 @@
 
   config.plugins = []
 end
-
-require Rails.root.join("config", "secret") if Rails.root.join("config", "secret.rb").file?
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -22,5 +22,3 @@
   #   :domain         => ENV['SENDGRID_DOMAIN']
   # }
 end
-
-require Rails.root.join("config", "secret") if Rails.root.join("config", "secret.rb").file?
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -7,5 +7,3 @@
   config.serve_static_assets = $rubygems_config[:asset_cacher]
   config.i18n.fallbacks = true
 end
-
-require Rails.root.join("config", "secret") if Rails.root.join("config", "secret.rb").file?
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
@@ -4,4 +4,12 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
+
+if Rails.env.maintenance? || Rails.env.staging? || Rails.env.production?
+  secret_path = Rails.root.join("config", "secret.rb")
+  if secret_path.file?
+    require secret_path.to_s
+  end
+end
+
 Rails.application.config.secret_token = ENV['SECRET_TOKEN'] || '53336f5ffda880aa2f6d5fbb7603b6df4d975408afbf44642d342547c25f92265eb01c34b118ee7fa87475f69949b07b292d95276aae2f6bda029ea25d28dc28'