diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
| commit | 0fa0836e63674104cea5095c5336bab8587d8634 (patch) | |
| tree | bcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /config/initializers | |
| parent | c074b226b68d81b0503f935dc81b74cd11b11d67 (diff) | |
| parent | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index df45dcd1f..97757d0fb 100644 --- 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 |