tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

fix logic for pam_controlled_service (#6599)

Browse Source
This commit is contained in:
Alexander 2018-03-02 19:02:50 +01:00 committed by Eugen Rochko
parent b4f8e87358
commit 42fe05dea1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production.sample
View File

@ -159,7 +159,7 @@ STREAMING_CLUSTER_NUM=1
# PAM_DEFAULT_SUFFIX=pam # PAM_DEFAULT_SUFFIX=pam
# Name of the pam service (pam "auth" section is evaluated) # Name of the pam service (pam "auth" section is evaluated)
# PAM_DEFAULT_SERVICE=rpam # 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 # PAM_CONTROLLED_SERVICE=rpam
# Global OAuth settings (optional) : # Global OAuth settings (optional) :

2
config/initializers/devise.rb
View File

@ -344,7 +344,7 @@ Devise.setup do |config|
config.check_at_sign = true config.check_at_sign = true
config.pam_default_suffix = ENV.fetch('PAM_DEFAULT_SUFFIX') { nil } config.pam_default_suffix = ENV.fetch('PAM_DEFAULT_SUFFIX') { nil }
config.pam_default_service = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' } 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 end
if ENV['LDAP_ENABLED'] == 'true' if ENV['LDAP_ENABLED'] == 'true'