A few major changes:

[selectricity-live] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 1ead71b75c34a98179303f795d795bf36f7ce2cd..dcc9fad3b4ee5a7d2a514c3533ba74394ad85b31 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,14 +1,19 @@
 # Be sure to restart your web server when you modify this file.
 
 # Be sure to restart your web server when you modify this file.
 

-# Uncomment below to force Rails into production mode
-# (Use only when you can't set environment variables through your web/app server)
+# Uncomment below to force Rails into production mode when 
+# you don't control web/app server and can't set it the proper way

 # ENV['RAILS_ENV'] ||= 'production'
 
 # ENV['RAILS_ENV'] ||= 'production'
 

+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '1.1.6'
+

 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|

-  # Skip frameworks you're not going to use
+  # Settings in config/environments/* take precedence those specified here
+  
+  # Skip frameworks you're not going to use (only works if using vendor/rails)

   # config.frameworks -= [ :action_web_service, :action_mailer ]
 
   # Add additional load paths for your own custom dirs
   # config.frameworks -= [ :action_web_service, :action_mailer ]
 
   # Add additional load paths for your own custom dirs


@@ -19,12 +24,13 @@ Rails::Initializer.run do |config|
   # config.log_level = :debug
 
   # Use the database for sessions instead of the file system
   # config.log_level = :debug
 
   # Use the database for sessions instead of the file system

-  # (create the session table with 'rake create_sessions_table')
+  # (create the session table with 'rake db:sessions:create')

   # config.action_controller.session_store = :active_record_store
 
   # config.action_controller.session_store = :active_record_store
 

-  # Enable page/fragment caching by setting a file-based store
-  # (remember to create the caching directory and make it readable to the application)
-  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper, 
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql

 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector


@@ -32,10 +38,6 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
   
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
   

-  # Use Active Record's schema dumper instead of SQL when creating the test database
-  # (enables use of different database adapters for development and test environments)
-  # config.active_record.schema_format = :ruby
-

   # See Rails::Configuration for more options
 end
 
   # See Rails::Configuration for more options
 end
 


@@ -48,4 +50,20 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

-# Include your application configuration below
\ No newline at end of file
+MAIL_CONFIG = { :from => 'VotingBooth <info@votingbooth.mako.cc>'} 
+
+# Include your application configuration below
+require 'uniq_token'
+require 'randarray'
+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"