Skip to content

Commit 9deccac

Browse files
committed
Updates to remove unnecessary parameters for my OpenLDAP use case
1 parent cf0fbb8 commit 9deccac

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

Diff for: manifests/domain.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@
231231
$entry_cache_timeout = 60,
232232
$krb5_canonicalize = false,
233233
) {
234-
validate_array($simple_allow_groups)
234+
#validate_array($simple_allow_groups)
235235
validate_bool($ldap_id_use_start_tls)
236236
validate_bool($enumerate)
237237
validate_bool($ldap_force_upper_case_realm)
238238
validate_bool($ldap_referrals)
239239
validate_bool($cache_credentials)
240240
validate_bool($krb5_canonicalize)
241241
validate_re($ldap_tls_reqcert,['hard','demand','try','allow','never'])
242-
validate_re($ldap_default_authtok_type,['password','obfuscated_password'])
242+
#validate_re($ldap_default_authtok_type,['password','obfuscated_password'])
243243
validate_re($ldap_schema,['rfc2307','rfc2307bis','ipa','ad'])
244244

245245
include sssd::params

Diff for: manifests/init.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878

7979
exec { 'authconfig-sssd':
80-
command => '/usr/sbin/authconfig --enablesssd --enablesssdauth --enablelocauthorize --update',
80+
command => '/usr/sbin/authconfig --enableshadow --enablemd5 --enableldap --enableldapauth --enableldaptls --enablelocauthorize --enablemkhomedir --update',
8181
refreshonly => true,
8282
subscribe => Concat['sssd_conf'],
8383
}

Diff for: templates/domain.conf.erb

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
[domain/<%= @ldap_domain %>]
22
id_provider = ldap
3-
auth_provider = krb5
4-
chpass_provider = krb5
5-
access_provider = simple
6-
simple_allow_groups = <%= @simple_allow_groups.flatten.join(',') %>
3+
auth_provider = ldap
4+
chpass_provider = ldap
75
cache_credentials = <%= @cache_credentials %>
86
min_id = <%= @real_min_id %>
97
entry_cache_timeout = <%= @entry_cache_timeout %>
10-
krb5_realm = <%= @krb5_realm %>
11-
krb5_canonicalize = <%= @krb5_canonicalize %>
128
ldap_uri = <%= @ldap_uri %>
139
ldap_search_base = <%= @ldap_search_base %>
14-
ldap_user_search_base = <%= @ldap_user_search_base %>
15-
ldap_group_search_base = <%= @ldap_group_search_base %>
16-
ldap_netgroup_search_base = <%= @ldap_netgroup_search_base %>
17-
ldap_referrals = <%= @ldap_referrals %>
18-
enumerate = <%= @enumerate %>
19-
ldap_force_upper_case_realm = <%= @ldap_force_upper_case_realm %>
20-
ldap_schema = <%= @ldap_schema %>
21-
ldap_default_bind_dn = <%= @ldap_default_bind_dn %>
22-
ldap_default_authtok_type = <%= @ldap_default_authtok_type %>
23-
ldap_default_authtok = <%= @ldap_default_authtok %>
2410
ldap_id_use_start_tls = <%= @ldap_id_use_start_tls %>
2511
ldap_tls_reqcert = <%= @ldap_tls_reqcert %>
2612
<% if @ldap_tls_cacert_path -%>

0 commit comments

Comments
 (0)