Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-19 20:17:18 +00:00
parent ab04be2f84 ff6b8a6443
commit df70571bfe
22 changed files with 134 additions and 77 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