From ed44d6cab2db3f9ceba7b9516a4a57f226648499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Sun, 5 May 2024 07:15:40 -1000 Subject: [PATCH] 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. --- manifests/mod/php.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp index 2b886bc63..37ed59e48 100644 --- a/manifests/mod/php.pp +++ b/manifests/mod/php.pp @@ -71,7 +71,10 @@ $manage_content = $source ? { undef => $content ? { - undef => epp($template, { 'extensions' => $extensions }), + undef => $template ? { + /\.epp\z/ => epp($template, { 'extensions' => $extensions }), + default => template($template), + }, default => $content, }, default => undef,