diff options
| -rw-r--r-- | config/environments/production.rb | 4 | ||||
| -rw-r--r-- | config/general.yml-example | 6 | ||||
| -rw-r--r-- | lib/configuration.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 73ee9d783..af2ca15b9 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -18,9 +18,9 @@ Alaveteli::Application.configure do # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false - config.action_mailer.delivery_method = AlaveteliConfiguration::mailer_delivery_method.to_sym + config.action_mailer.delivery_method = AlaveteliConfiguration::production_mailer_delivery_method.to_sym - if AlaveteliConfiguration::mailer_delivery_method.to_sym == :smtp + if AlaveteliConfiguration::production_mailer_delivery_method.to_sym == :smtp config.action_mailer.smtp_settings = { :address => AlaveteliConfiguration::smtp_mailer_address, :port => AlaveteliConfiguration.smtp_mailer_port, diff --git a/config/general.yml-example b/config/general.yml-example index 9c13f1c82..88d89958d 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -787,11 +787,11 @@ RESPONSIVE_STYLING: true # # As a string this is coerced into a symbol in config/environments/production.rb # -# MAILER_DELIVERY_METHOD - String (default: sendmail) +# PRODUCTION_MAILER_DELIVERY_METHOD - String (default: sendmail) # # Examples: # -# MAILER_DELIVERY_METHOD: smtp +# PRODUCTION_MAILER_DELIVERY_METHOD: smtp # SMTP_MAILER_ADDRESS: smtp.gmail.com # SMTP_MAILER_PORT: 587 # SMTP_MAILER_DOMAIN: example.com @@ -800,5 +800,5 @@ RESPONSIVE_STYLING: true # SMTP_MAILER_AUTHENTICATION: 'plain' # SMTP_MAILER_ENABLE_STARTTLS_AUTO: true # --- -MAILER_DELIVERY_METHOD: sendmail +PRODUCTION_MAILER_DELIVERY_METHOD: sendmail diff --git a/lib/configuration.rb b/lib/configuration.rb index 6e37a53f8..837e03cf9 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -46,13 +46,13 @@ 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-*', :MTA_LOG_TYPE => 'exim', :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', + :PRODUCTION_MAILER_DELIVERY_METHOD => 'sendmail', :PUBLIC_BODY_STATISTICS_PAGE => false, :PUBLIC_BODY_LIST_FALLBACK_TO_DEFAULT_LOCALE => false, :RAW_EMAILS_LOCATION => 'files/raw_emails', |