diff options
| author | Starfall <admin@plural.cafe> | 2020-07-01 12:06:19 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-07-01 12:06:19 -0500 |
| commit | 4d93b5c442ff5c9f4d640b4c7d543f0c04c120df (patch) | |
| tree | 4df391c12dc761ac99ca6421d53d8d31870b68ec /config/initializers | |
| parent | 5668836f56cddf3257f38a2483c1d42cacbad3a8 (diff) | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
Merge branch 'glitch' into main
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 |