rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)

2018-03-19 20:09:26 +01:00
parent 0306e3e9be
commit 33ee347c99
2 changed files with 3 additions and 3 deletions
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@ -342,7 +342,7 @@ Devise.setup do |config|
    config.usernamefield          = nil
    config.emailfield             = 'email'
    config.check_at_sign          = true
-    config.pam_default_suffix     = ENV.fetch('PAM_DEFAULT_SUFFIX') { nil }
+    config.pam_default_suffix     = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV['LOCAL_DOMAIN'] }
    config.pam_default_service    = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' }
    config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE') { nil }
  end