From 7464c8f22c3d0757965255ae85e70ada511748c5 Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Fri, 6 Oct 2023 13:48:26 +0200
Subject: [PATCH] Workaround for mod php not istallable on Debian

---
 apache.cf | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/apache.cf b/apache.cf
index 8952acd..2b27d5c 100644
--- a/apache.cf
+++ b/apache.cf
@@ -14,7 +14,6 @@ vars:
 	freebsd::
 		"pkgs" slist => {
 			"apache24",
-			"mod_php74"
 		};
 		"log_dir" string =>"/var/log/httpd";
 		"service_name" string => "apache24";
@@ -43,7 +42,6 @@ vars:
 	debian::
 		"pkgs" slist => {
 			"apache2",
-			"libapache2-mod-php",
 			"libapache2-mod-svn",
 		};
 		"log_dir" string =>"/var/log/apache2";
@@ -70,7 +68,6 @@ vars:
 		"pkgs" slist => {
 			"httpd",
 			"mod_ssl",
-			"libapache2-mod-php",
 			"libapache2-mod-svn",
 		};
 	fedora::
@@ -123,6 +120,45 @@ vars:
 }
 
 
+bundle agent install_apache_php
+{
+vars:
+	freeebsd::
+		"pkgs" slist => {"mod_php74"};
+	debian::
+		"pkgs" slist => {"libapache2-mod-php"};
+	centos::
+		"pkgs" slist => {"libapache2-mod-php"};
+
+packages:
+	freebsd::
+		"$(pkgs)"
+			policy => "present",
+			package_module => pkg,
+			handle => "apache_php_installed",
+			classes => if_repaired(apache_changed);
+	debian::
+		"$(pkgs)"
+			policy => "present",
+			package_module => apt_get,
+			handle => "apache_php_installed",
+			depends_on => { "apache_mpm_event_disabled" },
+			classes => if_repaired(apache_changed);
+	fedora|centos::
+		"$(pkgs)"
+			policy => "present",
+			package_module => yum,
+			handle => "apache_php_installed",
+			classes => if_repaired(apache_changed);
+
+commands:
+	"/bin/sh" 
+	args => "-c '/usr/sbin/a2dismod mpm_event > /dev/null'",
+	inform=>"false",
+	handle => "apache_mpm_event_disabled";
+
+}
+
 bundle agent install_apache(raw)
 {
 classes:
@@ -132,17 +168,23 @@ packages:
 		"$(apache.pkgs)"
 			policy => "present",
 			package_module => pkg,
+			handle => "apache_pkgs_installed",
 			classes => if_repaired(apache_changed);
 	debian::
 		"$(apache.pkgs)"
 			policy => "present",
 			package_module => apt_get,
+			handle => "apache_pkgs_installed",
 			classes => if_repaired(apache_changed);
 	fedora|centos::
 		"$(apache.pkgs)"
 			policy => "present",
 			package_module => yum,
+			handle => "apache_pkgs_installed",
 			classes => if_repaired(apache_changed);
+methods:
+	"any" usebundle => install_apache_php,
+		depends_on => { "apache_pkgs_installed" };
 commands:
 	freebsd::
 		"/usr/sbin/sysrc"
@@ -157,6 +199,7 @@ files:
 	"$(apache.www_dir)/."
 	create=>"true",
 	perms => uperm("root","root","755"),
+	depends_on => { "apache_pkgs_installed" },
 	handle => "apache_www_dir_created";	
 
 	"$(apache.default_html_dir)/."
@@ -169,6 +212,7 @@ files:
 	create=>"true",
 	content=>"",
 	perms => uperm("root","root","644"),
+	depends_on => { "apache_pkgs_installed" },
 	handle=> "apache_vhost_dir_created";	
 
 	"$(apache.main_cfg)"
@@ -176,6 +220,7 @@ files:
 		edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
 		template_method => "mustache",
 		handle => "apache_main_cfg_crreated",
+		depends_on => { "apache_pkgs_installed","apache_php_installed" },
 		classes => if_repaired(apache_changed);
 
 services: