Skip to content

Commit 2cf35eb

Browse files
committed
Refactor files template
1 parent 240b48d commit 2cf35eb

File tree

2 files changed

+30
-15
lines changed

2 files changed

+30
-15
lines changed

manifests/provider/files.pp

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,35 @@
2121
Optional[Array[Stdlib::Absolutepath]] $passwd_files = undef,
2222
Optional[Array[Stdlib::Absolutepath]] $group_files = undef,
2323
) {
24+
# Build configuration content for the Files provider
25+
$_content = [
26+
'# sssd::provider::files',
27+
]
28+
29+
# Add conditional parameters if defined
30+
if $passwd_files and !$passwd_files.empty {
31+
$_passwd_files_entries = ["passwd_files = ${passwd_files.join(', ')}"]
32+
} else {
33+
$_passwd_files_entries = []
34+
}
35+
36+
if $group_files and !$group_files.empty {
37+
$_group_files_entries = ["group_files = ${group_files.join(', ')}"]
38+
} else {
39+
$_group_files_entries = []
40+
}
41+
42+
# Combine all configuration entries
43+
$_all_entries = $_content + $_passwd_files_entries + $_group_files_entries
44+
45+
$_final_content = $_all_entries.join("\n")
46+
2447
sssd::config::entry { "puppet_provider_${name}_files":
2548
content => epp(
2649
"${module_name}/provider/files.epp",
2750
{
28-
'title' => $title,
29-
'passwd_files' => $passwd_files,
30-
'group_files' => $group_files,
51+
'title' => "domain/${title}",
52+
'content' => $_final_content,
3153
}
3254
),
3355
}

templates/provider/files.epp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
<% |
2-
String $title,
3-
Optional[Array[Stdlib::Absolutepath]] $passwd_files,
4-
Optional[Array[Stdlib::Absolutepath]] $group_files,
1+
<%- |
2+
String $title,
3+
String $content,
54
| -%>
6-
[domain/<%= $title %>]
7-
# sssd::provider::files
8-
<% if $passwd_files and ! $passwd_files.empty { -%>
9-
passwd_files = <%= $passwd_files.join(', ') %>
10-
<% } -%>
11-
<% if $group_files and ! $group_files.empty { -%>
12-
group_files = <%= $group_files.join(', ') %>
13-
<% } -%>
5+
[<%= $title %>]
6+
<%= $content %>

0 commit comments

Comments
 (0)