A few major changes:

[selectricity-live] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 22cfe503ceb88f58cbdeb1c71e32a8c143ea0b7d..dcc9fad3b4ee5a7d2a514c3533ba74394ad85b31 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -50,6 +50,8 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
+MAIL_CONFIG = { :from => 'VotingBooth <info@votingbooth.mako.cc>'} 
+
 # Include your application configuration below
 require 'uniq_token'
 require 'randarray'
@@ -57,6 +59,11 @@ require 'rubyvote'
 
 module LoginEngine
   config :salt, "voothingboat"
+  config :email_from, MAIL_CONFIG[:from]
 end
 
 Engines.start :login
+
+# action mailer configuration
+ActionMailer::Base.delivery_method = :sendmail
+ActionMailer::Base.default_charset = "utf-8"