diff options
| author | Alexander <devkral@web.de> | 2018-03-02 19:02:50 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-02 19:02:50 +0100 |
| commit | 42fe05dea1b1b18ef6e70d8d23e5e95ca3001f79 (patch) | |
| tree | 788c2f638aac835b934fa19cb453c71763229f32 | |
| parent | b4f8e8735801b517e2fcccde48355c5c7ad7f221 (diff) | |
fix logic for pam_controlled_service (#6599)
| -rw-r--r-- | .env.production.sample | 2 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.env.production.sample b/.env.production.sample index 05a043256..b96754e78 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -159,7 +159,7 @@ STREAMING_CLUSTER_NUM=1 # PAM_DEFAULT_SUFFIX=pam # Name of the pam service (pam "auth" section is evaluated) # PAM_DEFAULT_SERVICE=rpam -# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) +# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default) # PAM_CONTROLLED_SERVICE=rpam # Global OAuth settings (optional) : diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 0dc202976..df45dcd1f 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -344,7 +344,7 @@ Devise.setup do |config| config.check_at_sign = true config.pam_default_suffix = ENV.fetch('PAM_DEFAULT_SUFFIX') { nil } config.pam_default_service = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' } - config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE') { 'rpam' } + config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE') { nil } end if ENV['LDAP_ENABLED'] == 'true' |