diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-04 19:07:02 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-04 19:07:02 +0100 |
| commit | b362de2232da2518381df51ceb71166d0693dd6f (patch) | |
| tree | d2d23adb9e5bc3e3e64a794256fa7990b0fb82ed /config | |
| parent | 41b4be699fa5908dee13f0ceed391f88e2923853 (diff) | |
Adding configurable e-mail blacklist
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/blacklists.rb | 5 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 4 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/config/initializers/blacklists.rb b/config/initializers/blacklists.rb new file mode 100644 index 000000000..52646e64d --- /dev/null +++ b/config/initializers/blacklists.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +Rails.application.configure do + config.x.email_domains_blacklist = ENV.fetch('EMAIL_DOMAIN_BLACKLIST') { 'mvrht.com' } +end diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index 4ba432b6a..c5723b2e9 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -1,7 +1,9 @@ +# frozen_string_literal: true + port = ENV.fetch('PORT') { 3000 } host = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } https = ENV['LOCAL_HTTPS'] == 'true' - + Rails.application.configure do config.x.local_domain = host config.x.hub_url = ENV.fetch('HUB_URL') { 'https://pubsubhubbub.superfeedr.com' } diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 61bb52480..93822a2d1 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV['S3_ENABLED'] == 'true' Aws.eager_autoload!(services: %w(S3)) diff --git a/config/locales/en.yml b/config/locales/en.yml index 426f3928a..50a1f0e95 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -55,5 +55,7 @@ en: stream_entries: favourited: favourited a post by is_now_following: is now following + users: + invalid_email: The e-mail address is invalid will_paginate: page_gap: "…" |