Skip to content

Commit ed44d6c

Browse files
committed
Make sure we still support ERB templates when provided
`apache::mod::php` allowed to pass an ERB template, switching the default template to EPP will break users that rely on this, so only assume EPP template if the template name ends with .epp and process the template as ERB in all other cases.
1 parent 06c4091 commit ed44d6c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

manifests/mod/php.pp

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@
7171

7272
$manage_content = $source ? {
7373
undef => $content ? {
74-
undef => epp($template, { 'extensions' => $extensions }),
74+
undef => $template ? {
75+
/\.epp\z/ => epp($template, { 'extensions' => $extensions }),
76+
default => template($template),
77+
},
7578
default => $content,
7679
},
7780
default => undef,

0 commit comments

Comments
 (0)