Skip to content
Browse files

Converting the project to work with Ruby 1.8.7 and moving the TLS req…

…uirement from the main environment file
  • Loading branch information...
1 parent f9fa2a8 commit ba9b03bf10b2b44e37a11c36f8494a753315cd35 Jon Swope committed Jul 27, 2009
Showing with 24 additions and 17 deletions.
  1. +1 −14 config/environment.rb
  2. +11 −1 config/environments/development.rb
  3. +12 −2 config/environments/production.rb
View
15 config/environment.rb
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -24,7 +24,6 @@
config.gem 'haml'
config.gem 'authlogic'
- config.gem 'smtp_tls'
config.gem 'lockdown', :lib => false
@@ -49,15 +48,3 @@
end
-require 'smtp_tls'
-
-ActionMailer::Base.delivery_method = :smtp
-
-ActionMailer::Base.smtp_settings = {
- :address => 'smtp.gmail.com',
- :port => 587,
- :user_name => 'user@mycooldomain.com',
- :password => 'my_password',
- :authentication => :plain,
-}
-
View
12 config/environments/development.rb
@@ -14,4 +14,14 @@
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+config.action_mailer.raise_delivery_errors = false
+config.action_mailer.delivery_method = :smtp
+config.action_mailer.smtp_settings = {
+ :enable_starttls_auto => true,
+ :address => 'smtp.gmail.com',
+ :port => 587,
+ :domain => 'mycooldomain.com',
+ :user_name => 'user@mycooldomain.com',
+ :password => 'my_password',
+ :authentication => :plain,
+}
View
14 config/environments/production.rb
@@ -9,6 +9,7 @@
config.action_controller.perform_caching = true
config.action_view.cache_template_loading = true
+
# See everything in the log (default is :info)
# config.log_level = :debug
@@ -23,6 +24,15 @@
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
-
+config.action_mailer.delivery_method = :smtp
+config.action_mailer.smtp_settings = {
+ :enable_starttls_auto => true,
+ :address => 'smtp.gmail.com',
+ :port => 587,
+ :domain => 'mycooldomain.com',
+ :user_name => 'user@mycooldomain.com',
+ :password => 'my_password',
+ :authentication => :plain,
+}
# Enable threaded mode
-# config.threadsafe!
+# config.threadsafe!

0 comments on commit ba9b03b

Please sign in to comment.
Something went wrong with that request. Please try again.