Skip to content

Added: #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crsndr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added: #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48d5fd6
Added:
Nov 4, 2015
92d065b
- undef for new parameters
Nov 11, 2015
88a82cf
Test and comment
Nov 12, 2015
1a19c5c
Test corrected
Nov 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@
# Default: ''
# Valid options: beaver
#
# [*$ldap_group_search_base*]
# String. An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type
# Default: ''
# Valid options: [?scope?[filter][?search_base?scope?[filter]]*]
#
# [*$ldap_user_search_base*]
# String. An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type
# Default: ''
# Valid options: [?scope?[filter][?search_base?scope?[filter]]*]
#
# === Examples
#
# * Installation:
Expand Down Expand Up @@ -120,6 +130,8 @@
$manage_nsswitch = true,
$logsagent = undef,
$debug_level = '0x02F0',
$ldap_group_search_base = undef,
$ldap_user_search_base = undef,
){

validate_re($provider, ['^ldap$', '^ipa$'], 'Supported providers for SSSD are ldap and ipa')
Expand Down
10 changes: 10 additions & 0 deletions spec/classes/sssd_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
let(:params) { { :ldap_tls_cacert => '/tmp/cert' } }
it { should contain_file('/etc/sssd/sssd.conf').with_content(/ldap_tls_cacert = \/tmp\/cert/)}
end

context 'setting ldap_group_search_base' do
let(:params) { { :ldap_group_search_base => 'dc=Group,dc=org' } }
it { should contain_file('/etc/sssd/sssd.conf').with_content(/ldap_group_search_base = dc=Group,dc=org/)}
end

context 'setting ldap_user_search_base' do
let(:params) { { :ldap_user_search_base => 'dc=User,dc=org' } }
it { should contain_file('/etc/sssd/sssd.conf').with_content(/ldap_user_search_base = dc=User,dc=org/)}
end
end

context 'ipa' do
Expand Down
6 changes: 6 additions & 0 deletions templates/sssd.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ ldap_chpass_update_last_change = true
ldap_pwd_policy = <%= scope.lookupvar('sssd::ldap_pwd_policy') %>
ldap_account_expire_policy = shadow
ldap_access_order = expire
<% if scope.lookupvar('sssd::ldap_group_search_base') -%>
ldap_group_search_base = <%= scope.lookupvar('sssd::ldap_group_search_base') %>
<% end -%>
<% if scope.lookupvar('sssd::ldap_user_search_base') -%>
ldap_user_search_base = <%= scope.lookupvar('sssd::ldap_user_search_base') %>
<% end -%>
<% elsif scope.lookupvar('sssd::provider') == 'ipa' %>
krb5_store_password_if_offline = true
ipa_domain = <%= scope.lookupvar('sssd::domain') %>
Expand Down