fix logic for pam_controlled_service (#6599)

diff --git a/.env.production.sample b/.env.production.sample
index 05a04325627b78f2defd731a4158b443a89afd83..b96754e78503c324313d55cc8693b244768bddfa 100644 (file)
--- 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 0dc20297647011eb6affe56e3214b85f8e342785..df45dcd1f43f81d5e9f4f086e9c19d94ec3f9c90 100644 (file)
--- 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'