Skip to content

Commit 6abc511

Browse files
silugsilug
committed
Migrate additional files
1 parent 2140288 commit 6abc511

38 files changed

+1431
-709
lines changed

‎manifests/config.pp‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# @author https://github.com/simp/pupmod-simp-sssd/graphs/contributors
1414
#
1515
class sssd::config (
16-
Boolean $authoritative = pick(getvar("${module_name}::authoritative"), false)
17-
){
16+
Boolean $authoritative = pick(getvar("${module_name}::authoritative"), false),
17+
) {
1818
assert_private()
1919

2020
include $module_name
@@ -52,27 +52,47 @@
5252

5353
file { '/etc/sssd':
5454
ensure => 'directory',
55-
mode => 'go-rw'
55+
mode => 'go-rw',
5656
}
5757

5858
file { '/etc/sssd/conf.d':
5959
ensure => 'directory',
6060
purge => $authoritative,
61-
recurse => true
61+
recurse => true,
6262
}
6363

6464
unless $authoritative {
6565
tidy { '/etc/sssd/conf.d':
6666
matches => '*_puppet_*.conf',
67-
recurse => true
67+
recurse => true,
6868
}
6969
}
7070

7171
file { '/etc/sssd/sssd.conf':
7272
owner => 'root',
7373
group => 'root',
7474
mode => '0600',
75-
content => template("${module_name}/sssd.conf.erb"),
76-
notify => Class["${module_name}::service"]
75+
content => epp(
76+
"${module_name}/sssd.conf.epp",
77+
{
78+
'_domains' => $_domains,
79+
'_debug_level' => $_debug_level,
80+
'_debug_timestamps' => $_debug_timestamps,
81+
'_debug_microseconds' => $_debug_microseconds,
82+
'_description' => $_description,
83+
'_enable_files_domain' => $_enable_files_domain,
84+
'_config_file_version' => $_config_file_version,
85+
'_services' => $_services,
86+
'_reconnection_retries' => $_reconnection_retries,
87+
'_re_expression' => $_re_expression,
88+
'_full_name_format' => $_full_name_format,
89+
'_try_inotify' => $_try_inotify,
90+
'_krb5_rcache_dir' => $_krb5_rcache_dir,
91+
'_user' => $_user,
92+
'_default_domain_suffix' => $_default_domain_suffix,
93+
'_override_space' => $_override_space,
94+
},
95+
),
96+
notify => Class["${module_name}::service"],
7797
}
7898
}

‎manifests/provider/ad.pp‎

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,62 @@
151151
Optional[String[1]] $ldap_user_ssh_public_key = undef,
152152
) {
153153
sssd::config::entry { "puppet_provider_${name}_ad":
154-
content => template("${module_name}/provider/ad.erb")
154+
content => epp(
155+
"${module_name}/provider/ad.epp",
156+
{
157+
'ad_domain' => $ad_domain,
158+
'ad_enabled_domains' => $ad_enabled_domains,
159+
'ad_servers' => $ad_servers,
160+
'ad_backup_servers' => $ad_backup_servers,
161+
'ad_hostname' => $ad_hostname,
162+
'ad_enable_dns_sites' => $ad_enable_dns_sites,
163+
'ad_access_filters' => $ad_access_filters,
164+
'ad_site' => $ad_site,
165+
'ad_enable_gc' => $ad_enable_gc,
166+
'ad_gpo_access_control' => $ad_gpo_access_control,
167+
'ad_gpo_cache_timeout' => $ad_gpo_cache_timeout,
168+
'ad_gpo_map_interactive' => $ad_gpo_map_interactive,
169+
'ad_gpo_map_remote_interactive' => $ad_gpo_map_remote_interactive,
170+
'ad_gpo_map_network' => $ad_gpo_map_network,
171+
'ad_gpo_map_batch' => $ad_gpo_map_batch,
172+
'ad_gpo_map_service' => $ad_gpo_map_service,
173+
'ad_gpo_map_permit' => $ad_gpo_map_permit,
174+
'ad_gpo_map_deny' => $ad_gpo_map_deny,
175+
'ad_gpo_default_right' => $ad_gpo_default_right,
176+
'ad_gpo_implicit_deny' => $ad_gpo_implicit_deny,
177+
'ad_gpo_ignore_unreadable' => $ad_gpo_ignore_unreadable,
178+
'ad_maximum_machine_account_password_age' => $ad_maximum_machine_account_password_age,
179+
'ad_machine_account_password_renewal_opts' => $ad_machine_account_password_renewal_opts,
180+
'default_shell' => $default_shell,
181+
'dyndns_update' => $dyndns_update,
182+
'dyndns_ttl' => $dyndns_ttl,
183+
'dyndns_ifaces' => $dyndns_ifaces,
184+
'dyndns_refresh_interval' => $dyndns_refresh_interval,
185+
'dyndns_update_ptr' => $dyndns_update_ptr,
186+
'dyndns_force_tcp' => $dyndns_force_tcp,
187+
'dyndns_server' => $dyndns_server,
188+
'override_homedir' => $override_homedir,
189+
'fallback_homedir' => $fallback_homedir,
190+
'homedir_substring' => $homedir_substring,
191+
'krb5_realm' => $krb5_realm,
192+
'krb5_confd_path' => $krb5_confd_path,
193+
'krb5_use_enterprise_principal' => $krb5_use_enterprise_principal,
194+
'krb5_store_password_if_offline' => $krb5_store_password_if_offline,
195+
'ldap_id_mapping' => $ldap_id_mapping,
196+
'ldap_schema' => $ldap_schema,
197+
'ldap_idmap_range_min' => $ldap_idmap_range_min,
198+
'ldap_idmap_range_max' => $ldap_idmap_range_max,
199+
'ldap_idmap_range_size' => $ldap_idmap_range_size,
200+
'ldap_idmap_default_domain_sid' => $ldap_idmap_default_domain_sid,
201+
'ldap_idmap_default_domain' => $ldap_idmap_default_domain,
202+
'ldap_idmap_autorid_compat' => $ldap_idmap_autorid_compat,
203+
'ldap_idmap_helper_table_size' => $ldap_idmap_helper_table_size,
204+
'ldap_use_tokengroups' => $ldap_use_tokengroups,
205+
'ldap_group_objectsid' => $ldap_group_objectsid,
206+
'ldap_user_objectsid' => $ldap_user_objectsid,
207+
'ldap_user_extra_attrs' => $ldap_user_extra_attrs,
208+
'ldap_user_ssh_public_key' => $ldap_user_ssh_public_key,
209+
}
210+
),
155211
}
156212
}

‎manifests/provider/files.pp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
Optional[Array[Stdlib::Absolutepath]] $group_files = undef
2323
) {
2424
sssd::config::entry { "puppet_provider_${name}_files":
25-
content => template("${module_name}/provider/files.erb")
25+
content => epp(
26+
"${module_name}/provider/files.epp",
27+
{
28+
'passwd_files' => $passwd_files,
29+
'group_files' => $group_files,
30+
}
31+
),
2632
}
2733
}

‎manifests/provider/ipa.pp‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
Boolean $krb5_store_password_if_offline = true,
7474
Stdlib::AbsolutePath $ldap_tls_cacert = '/etc/ipa/ca.crt',
7575
Array[String] $ldap_tls_cipher_suite = ['HIGH','-SSLv2'],
76-
Boolean $use_service_discovery = true
76+
Boolean $use_service_discovery = true,
7777
) {
7878
if $use_service_discovery {
7979
$_ipa_server = ['_srv_'] + $ipa_server
@@ -83,6 +83,39 @@
8383
}
8484

8585
sssd::config::entry { "puppet_provider_${name}_ipa":
86-
content => template("${module_name}/provider/ipa.erb")
86+
content => epp(
87+
"${module_name}/provider/ipa.epp",
88+
{
89+
'ipa_domain' => $ipa_domain,
90+
'ipa_server' => $ipa_server,
91+
'ipa_backup_server' => $ipa_backup_server,
92+
'ipa_enable_dns_sites' => $ipa_enable_dns_sites,
93+
'ipa_hostname' => $ipa_hostname,
94+
'ipa_server_mode' => $ipa_server_mode,
95+
'dyndns_auth' => $dyndns_auth,
96+
'dyndns_force_tcp' => $dyndns_force_tcp,
97+
'dyndns_iface' => $dyndns_iface,
98+
'dyndns_refresh_interval' => $dyndns_refresh_interval,
99+
'dyndns_server' => $dyndns_server,
100+
'dyndns_ttl' => $dyndns_ttl,
101+
'dyndns_update' => $dyndns_update,
102+
'dyndns_update_ptr' => $dyndns_update_ptr,
103+
'ipa_automount_location' => $ipa_automount_location,
104+
'ipa_hbac_refresh' => $ipa_hbac_refresh,
105+
'ipa_hbac_search_base' => $ipa_hbac_search_base,
106+
'ipa_hbac_selinux' => $ipa_hbac_selinux,
107+
'ipa_host_search_base' => $ipa_host_search_base,
108+
'ipa_master_domains_search_base' => $ipa_master_domains_search_base,
109+
'ipa_selinux_search_base' => $ipa_selinux_search_base,
110+
'ipa_subdomains_search_base' => $ipa_subdomains_search_base,
111+
'ipa_views_search_base' => $ipa_views_search_base,
112+
'krb5_confd_path' => $krb5_confd_path,
113+
'krb5_realm' => $krb5_realm,
114+
'krb5_store_password_if_offline' => $krb5_store_password_if_offline,
115+
'ldap_tls_cacert' => $ldap_tls_cacert,
116+
'ldap_tls_cipher_suite' => $ldap_tls_cipher_suite,
117+
'use_service_discovery' => $use_service_discovery,
118+
}
119+
),
87120
}
88121
}

‎manifests/provider/krb5.pp‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,27 @@
4747
) {
4848

4949
sssd::config::entry { "puppet_provider_${name}_krb5":
50-
content => epp("${module_name}/provider/krb5", {
51-
'domain' => $title,
52-
'krb5_server' => $krb5_server,
53-
'krb5_realm' => $krb5_realm,
54-
'debug_level' => $debug_level,
55-
'debug_timestamps' => $debug_timestamps,
56-
'debug_microseconds' => $debug_microseconds,
57-
'krb5_kpasswd' => $krb5_kpasswd,
58-
'krb5_ccachedir' => $krb5_ccachedir,
59-
'krb5_ccname_template' => $krb5_ccname_template,
60-
'krb5_auth_timeout' => $krb5_auth_timeout,
61-
'krb5_validate' => $krb5_validate,
62-
'krb5_keytab' => $krb5_keytab,
63-
'krb5_store_password_if_offline' => $krb5_store_password_if_offline,
64-
'krb5_renewable_lifetime' => $krb5_renewable_lifetime,
65-
'krb5_lifetime' => $krb5_lifetime,
66-
'krb5_renew_interval' => $krb5_renew_interval,
67-
'krb5_use_fast' => $krb5_use_fast
68-
})
50+
content => epp(
51+
"${module_name}/provider/krb5",
52+
{
53+
'domain' => $title,
54+
'krb5_server' => $krb5_server,
55+
'krb5_realm' => $krb5_realm,
56+
'debug_level' => $debug_level,
57+
'debug_timestamps' => $debug_timestamps,
58+
'debug_microseconds' => $debug_microseconds,
59+
'krb5_kpasswd' => $krb5_kpasswd,
60+
'krb5_ccachedir' => $krb5_ccachedir,
61+
'krb5_ccname_template' => $krb5_ccname_template,
62+
'krb5_auth_timeout' => $krb5_auth_timeout,
63+
'krb5_validate' => $krb5_validate,
64+
'krb5_keytab' => $krb5_keytab,
65+
'krb5_store_password_if_offline' => $krb5_store_password_if_offline,
66+
'krb5_renewable_lifetime' => $krb5_renewable_lifetime,
67+
'krb5_lifetime' => $krb5_lifetime,
68+
'krb5_renew_interval' => $krb5_renew_interval,
69+
'krb5_use_fast' => $krb5_use_fast,
70+
},
71+
)
6972
}
7073
}

0 commit comments

Comments
 (0)