X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/ad5ca8bbfbef358919aa877e78dceb27fdc6387a..c49bd887561c4ee07feef7e6e8d25b6a3f15b5b7:/config/environment.rb?ds=inline

diff --git a/config/environment.rb b/config/environment.rb
index 571638d..49b0c48 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,7 +63,7 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
-require 'gruff'
+require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 
 require 'rubyvote'
@@ -87,6 +87,10 @@ class String
   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"