aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-04-16 11:19:21 +0100
committerLouise Crow <louise.crow@gmail.com>2015-04-16 11:19:21 +0100
commit71c9e1d977b643c43e540992f21bc33d3b0bf837 (patch)
tree7d32029d890da56c1c4f45c713e20ffca0209783
parentc9fc95d30f527c36d7d6baa2666a8bdab7d72b6e (diff)
parent460dadcf87c6d3c8800c364c99aa75e9cb70fcb9 (diff)
Merge branch 'smtp-tweaks' into rails-3-develop
-rw-r--r--lib/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb
index 837e03cf9..7921b93fa 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -64,8 +64,8 @@ module AlaveteliConfiguration
:RESPONSIVE_STYLING => true,
:SITE_NAME => 'Alaveteli',
:SKIP_ADMIN_AUTH => false,
- :SMTP_MAILER_ADDRESS => '',
- :SMTP_MAILER_PORT => 587,
+ :SMTP_MAILER_ADDRESS => 'localhost',
+ :SMTP_MAILER_PORT => 25,
:SMTP_MAILER_DOMAIN => '',
:SMTP_MAILER_USER_NAME => '',
:SMTP_MAILER_PASSWORD => '',