zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-26 04:28:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-186

Browse source
This commit is contained in:
Artur Beljajev 2016-11-03 18:29:42 +02:00
commit e52c747946
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/application-example.yml
View file

@ -21,7 +21,7 @@ smtp_openssl_verify_mode: 'peer' # 'none', 'peer', 'client_once','fail_if_no_pee
smtp_enable_starttls_auto: 'true' # 'false' smtp_enable_starttls_auto: 'true' # 'false'
# If your mail server requires authentication, please change. # If your mail server requires authentication, please change.
smtp_authentication: 'plain' # 'plain', 'login', 'cram_md5' smtp_authentication: 'plain' # 'plain', 'login', 'cram_md5'
registrant_url: 'https:/registrant.example.com' # for valid email body registrant links registrant_url: 'https://registrant.example.com' # for valid email body registrant links
# Staging env does not send any emails unless they are whitelisted # Staging env does not send any emails unless they are whitelisted
whitelist_emails_for_staging: > whitelist_emails_for_staging: >
test@example.org, test@example.org,

4
config/application.rb
View file

@ -60,6 +60,10 @@ module Registry
g.helper false g.helper false
end end
registrant_portal_uri = URI.parse(ENV['registrant_url'])
config.action_mailer.default_url_options = { host: registrant_portal_uri.host,
protocol: registrant_portal_uri.scheme }
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_mailer.perform_deliveries = true config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true config.action_mailer.raise_delivery_errors = true

5
config/environments/development-example.rb
View file

@ -33,11 +33,6 @@ Rails.application.configure do
config.action_view.raise_on_missing_translations = true config.action_view.raise_on_missing_translations = true
config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = { host: 'localhost:8081' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 } # MailCatcher
# for finding database optimization # for finding database optimization
config.after_initialize do config.after_initialize do
Bullet.enable = true Bullet.enable = true