diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
| commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
| tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /config/initializers | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) | |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/2_whitelist_mode.rb | 2 | ||||
| -rw-r--r-- | config/initializers/blacklists.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/2_whitelist_mode.rb b/config/initializers/2_whitelist_mode.rb index a17ad07a2..1cc6a8e72 100644 --- a/config/initializers/2_whitelist_mode.rb +++ b/config/initializers/2_whitelist_mode.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true Rails.application.configure do - config.x.whitelist_mode = ENV['WHITELIST_MODE'] == 'true' + config.x.whitelist_mode = (ENV['LIMITED_FEDERATION_MODE'] || ENV['WHITELIST_MODE']) == 'true' end diff --git a/config/initializers/blacklists.rb b/config/initializers/blacklists.rb index 020d84f56..0e3339c98 100644 --- a/config/initializers/blacklists.rb +++ b/config/initializers/blacklists.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true Rails.application.configure do - config.x.email_domains_blacklist = ENV.fetch('EMAIL_DOMAIN_BLACKLIST') { 'mvrht.com' } - config.x.email_domains_whitelist = ENV.fetch('EMAIL_DOMAIN_WHITELIST') { '' } + config.x.email_domains_blacklist = (ENV['EMAIL_DOMAIN_DENYLIST'] || ENV['EMAIL_DOMAIN_BLACKLIST']) || '' + config.x.email_domains_whitelist = (ENV['EMAIL_DOMAIN_ALLOWLIST'] || ENV['EMAIL_DOMAIN_WHITELIST']) || '' end |