moved the smtp setting to intializers

4 files changed, 24 insertions, 22 deletions

diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index 069823a05..deb69220e 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -12,6 +12,13 @@ default:
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
   mongo_host: 'localhost'
   mongo_port: 27017
+  smtp_address: 'smtp.example.com'
+  smtp_port: '587'
+  smtp_domain: 'mail.example.com'
+  smtp_authentication: 'plain'
+  smtp_username: 'no-reply@example.com'
+  smtp_password: 'secret'
+  
 
 development:
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 15d1fc2bb..063adbd1b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,15 +24,4 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
-    config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
-  config.action_mailer.smtp_settings = {
-    :address => 'smtp.gmail.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
-    :enable_starttls_auto => true
-  }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb13c1d1c..bdeeea249 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -48,15 +48,4 @@ Diaspora::Application.configure do
   config.i18n.fallbacks = true
   config.threadsafe!
 
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
-  config.action_mailer.smtp_settings = {
-    :address => 'smtp.gmail.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
-    :enable_starttls_auto => true
-  }
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
new file mode 100644
index 000000000..823a369fe
--- /dev/null
+++ b/config/initializers/mailer_config.rb
@@ -0,0 +1,17 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+Diaspora::Application.configure do
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
+  config.action_mailer.smtp_settings = {
+    :address => APP_CONFIG[:smtp_address],
+    :port => APP_CONFIG[:smtp_port],
+    :domain => APP_CONFIG[:smtp_domain],
+    :authentication => APP_CONFIG[:smtp_authentication],
+    :user_name => APP_CONFIG[:smtp_username],
+    :password => APP_CONFIG[:smtp_password],
+    :enable_starttls_auto => true
+  }
+end