From 1ae5311b812655c681c5e7047a13656547edcab3 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Mon, 27 Nov 2023 16:43:13 +0100
Subject: [PATCH] disable default php-fpm config for apache as for some users,
 it is enabled and used prior to froxlor generated virtual-host configs
 resulting in no php-rendering

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/configfiles/bookworm.xml | 5 +++++
 lib/configfiles/jammy.xml    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml
index 6d65c233..0eb13095 100644
--- a/lib/configfiles/bookworm.xml
+++ b/lib/configfiles/bookworm.xml
@@ -3383,6 +3383,11 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[a2dismod php8.2]]></command>
 					</commands>
+					<commands index="5">
+						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
+						</visibility>
+						<command><![CDATA[a2disconf php8.2-fpm]]></command>
+					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the
 						dirty work -->
 					<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>
diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml
index 36d2ef9d..475958f9 100644
--- a/lib/configfiles/jammy.xml
+++ b/lib/configfiles/jammy.xml
@@ -4172,6 +4172,11 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[a2dismod php8.1]]></command>
 					</commands>
+					<commands index="5">
+						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
+						</visibility>
+						<command><![CDATA[a2disconf php8.1-fpm]]></command>
+					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the
 						dirty work -->
 					<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>