From afb9d131309b8a628d55735c653bf1bd4c1f937b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Sun, 19 Nov 2023 12:59:13 -1000 Subject: [PATCH] Fix mod_suexec usage The missing newline break apache configuration: ``` apache2: Syntax error on line 50 of /etc/apache2/apache2.conf: Syntax error on line 6 of /etc/apache2/sites-enabled/25-example.com-443.conf:6: was not closed. ``` Add the missing new line. While here, alse remove the legacy (now unused) template and fix indentation of the generated statement. --- manifests/vhost.pp | 2 +- templates/vhost/_suexec.epp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 templates/vhost/_suexec.epp diff --git a/manifests/vhost.pp b/manifests/vhost.pp index bb1ad02de8..04bc8e77be 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -2713,7 +2713,7 @@ concat::fragment { "${name}-suexec": target => "${priority_real}${filename}.conf", order => 290, - content => "SuexecUserGroup ${suexec_user_group}", + content => " SuexecUserGroup ${suexec_user_group}\n", } } diff --git a/templates/vhost/_suexec.epp b/templates/vhost/_suexec.epp deleted file mode 100644 index da0f3eb59d..0000000000 --- a/templates/vhost/_suexec.epp +++ /dev/null @@ -1,4 +0,0 @@ -<% if $suexec_user_group { -%> - -SuexecUserGroup <%= $suexec_user_group %> -<% } -%>