diff options
| -rw-r--r-- | config/environments/production.rb | 14 | ||||
| -rw-r--r-- | config/general.yml-example | 14 | ||||
| -rw-r--r-- | lib/configuration.rb | 18 |
3 files changed, 23 insertions, 23 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 diff --git a/lib/configuration.rb b/lib/configuration.rb index 2115ffaf6..6e37a53f8 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -46,6 +46,7 @@ module AlaveteliConfiguration :INCOMING_EMAIL_PREFIX => 'foi+', :INCOMING_EMAIL_SECRET => 'dummysecret', :ISO_COUNTRY_CODE => 'GB', + :MAILER_DELIVERY_METHOD => 'sendmail', :MINIMUM_REQUESTS_FOR_STATISTICS => 100, :MAX_REQUESTS_PER_USER_PER_DAY => 6, :MTA_LOG_PATH => '/var/log/exim4/exim-mainlog-*', @@ -63,6 +64,13 @@ module AlaveteliConfiguration :RESPONSIVE_STYLING => true, :SITE_NAME => 'Alaveteli', :SKIP_ADMIN_AUTH => false, + :SMTP_MAILER_ADDRESS => '', + :SMTP_MAILER_PORT => 587, + :SMTP_MAILER_DOMAIN => '', + :SMTP_MAILER_USER_NAME => '', + :SMTP_MAILER_PASSWORD => '', + :SMTP_MAILER_AUTHENTICATION => 'plain', + :SMTP_MAILER_ENABLE_STARTTLS_AUTO => true, :SPECIAL_REPLY_VERY_LATE_AFTER_DAYS => 60, :THEME_BRANCH => false, :THEME_URL => "", @@ -77,15 +85,7 @@ module AlaveteliConfiguration :USE_MAILCATCHER_IN_DEVELOPMENT => true, :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], :VARNISH_HOST => '', - :WORKING_OR_CALENDAR_DAYS => 'working', - :MAILER_DELIVERY_METHOD => 'sendmail', - :MAILER_ADDRESS => '', - :MAILER_PORT => 587, - :MAILER_DOMAIN => '', - :MAILER_USER_NAME => '', - :MAILER_PASSWORD => '', - :MAILER_AUTHENTICATION => 'plain', - :MAILER_ENABLE_STARTTLS_AUTO => true + :WORKING_OR_CALENDAR_DAYS => 'working' } end |