Merge pull request #193 from kiesia/hotfix/fix_devise_initialization

Initialize dotenv vars correctly in debian, simplify conf
RefugeRestrooms · Jan 30, 2015 · 5694f83 · 5694f83
2 parents f0ddee3 + f6e1ee4
commit 5694f83
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,2 @@
+export DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
+export RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
diff --git a/.env.development b/.env.development
diff --git a/.env.test b/.env.test
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -5,7 +5,7 @@
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
 
-  config.secret_key = ENV["DEVISE_SECRET_KEY"] if Rails.env == "production" || Rails.env == "test"
+  config.secret_key = ENV["DEVISE_SECRET_KEY"]
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
		export RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961