aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environments/production.rb14
-rw-r--r--config/general.yml-example14
2 files changed, 14 insertions, 14 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index daa16bcef..73ee9d783 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,13 +22,13 @@ Alaveteli::Application.configure do
if AlaveteliConfiguration::mailer_delivery_method.to_sym == :smtp
config.action_mailer.smtp_settings = {
- :address => AlaveteliConfiguration::mailer_address,
- :port => AlaveteliConfiguration.mailer_port,
- :domain => AlaveteliConfiguration.mailer_domain,
- :user_name => AlaveteliConfiguration.mailer_user_name,
- :password => AlaveteliConfiguration.mailer_password,
- :authentication => AlaveteliConfiguration.mailer_authentication,
- :enable_starttls_auto => AlaveteliConfiguration.mailer_enable_starttls_auto
+ :address => AlaveteliConfiguration::smtp_mailer_address,
+ :port => AlaveteliConfiguration.smtp_mailer_port,
+ :domain => AlaveteliConfiguration.smtp_mailer_domain,
+ :user_name => AlaveteliConfiguration.smtp_mailer_user_name,
+ :password => AlaveteliConfiguration.smtp_mailer_password,
+ :authentication => AlaveteliConfiguration.smtp_mailer_authentication,
+ :enable_starttls_auto => AlaveteliConfiguration.smtp_mailer_enable_starttls_auto
}
end
diff --git a/config/general.yml-example b/config/general.yml-example
index b4afb394a..739ea9de6 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -792,13 +792,13 @@ RESPONSIVE_STYLING: true
# Examples:
#
# MAILER_DELIVERY_METHOD: smtp
-# MAILER_ADDRESS: smtp.gmail.com
-# MAILER_PORT: 587
-# MAILER_DOMAIN: example.com
-# MAILER_USER_NAME: jane322
-# MAILER_PASSWORD: supersecretpassword
-# MAILER_AUTHENTICATION: 'plain'
-# MAILER_ENABLE_STARTTLS_AUTO: true
+# SMTP_MAILER_ADDRESS: smtp.gmail.com
+# SMTP_MAILER_PORT: 587
+# SMTP_MAILER_DOMAIN: example.com
+# SMTP_MAILER_USER_NAME: jane322
+# SMTP_MAILER_PASSWORD: supersecretpassword
+# SMTP_MAILER_AUTHENTICATION: 'plain'
+# SMTP_MAILER_ENABLE_STARTTLS_AUTO: true
# ---
MAILER_DELIVERY_METHOD: sendmail