Merge from jdong

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 571638d14a3fc1a0ccefbce34442f8cbc1fa8fc0..80f19b46ee25983f4511ac36c4142d8daf895857 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -87,6 +87,10 @@ class String
   end
 end
 
   end
 end
 

+#Change the session store key, so that it will not conflict with other webapps
+ActionController::Base.session_options[:session_key] = 'selectricity_session_id'
+CGI::Session.expire_after 1.year
+

 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"