From d0c4d5616a67ed12f0c5b81940cc9be8ab501995 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 11 Jun 2015 20:59:41 +0200
Subject: [PATCH] adjust fastcgi conf for php-fpm when using apache-2.4

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 lib/configfiles/gentoo.xml | 20 ++++++++++++++++++--
 lib/configfiles/trusty.xml | 20 ++++++++++++++++++--
 lib/configfiles/wheezy.xml | 20 ++++++++++++++++++--
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index db0f1b24..6f3deb08 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -68,8 +68,24 @@
 					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 				</daemon>
 				<daemon name="apache" version="2.4" title="Apache 2.4">
-					<include>//service[@type='http']/daemon[@name='apache'][@version='2.2']
-					</include>
+					<include>//service[@type='http']/general/commands</include>
+					<file name="/etc/apache2/modules.d/70_fastcgi.conf">
+						<visibility mode="true">{{settings.phpfpm.enabled}}
+						</visibility>
+						<content><![CDATA[
+<IfModule mod_fastcgi.c>
+    FastCgiIpcDir <FPM_IPCDIR>
+
+    <Location "/fastcgiphp">
+		Require all granted
+        Require env REDIRECT_STATUS
+    </Location>
+</IfModule>
+]]>
+						</content>
+					</file>
+					<command><![CDATA[rc-update add apache2 default]]></command>
+					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index 65df233d..b91656df 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -68,8 +68,24 @@
 					<command><![CDATA[service apache2 restart]]></command>
 				</daemon>
 				<daemon name="apache" version="2.4" title="Apache 2.4">
-					<include>//service[@type='http']/daemon[@name='apache'][@version='2.2']
-					</include>
+					<install><![CDATA[apt-get install apache2]]></install>
+					<include>//service[@type='http']/general/commands</include>
+					<file name="/etc/apache2/mods-enabled/fastcgi.conf">
+						<visibility mode="true">{{settings.phpfpm.enabled}}
+						</visibility>
+						<content><![CDATA[
+<IfModule mod_fastcgi.c>
+    FastCgiIpcDir <FPM_IPCDIR>
+
+    <Location "/fastcgiphp">
+		Require all granted
+        Require env REDIRECT_STATUS
+    </Location>
+</IfModule>
+]]>
+						</content>
+					</file>
+					<command><![CDATA[service apache2 restart]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index 62c0d741..447ecd4e 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -68,8 +68,24 @@
 					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 				</daemon>
 				<daemon name="apache" version="2.4" title="Apache 2.4">
-					<include>//service[@type='http']/daemon[@name='apache'][@version='2.2']
-					</include>
+					<install><![CDATA[apt-get install apache2]]></install>
+					<include>//service[@type='http']/general/commands</include>
+					<file name="/etc/apache2/mods-enabled/fastcgi.conf">
+						<visibility mode="true">{{settings.phpfpm.enabled}}
+						</visibility>
+						<content><![CDATA[
+<IfModule mod_fastcgi.c>
+    FastCgiIpcDir <FPM_IPCDIR>
+
+    <Location "/fastcgiphp">
+		Require all granted
+        Require env REDIRECT_STATUS
+    </Location>
+</IfModule>
+]]>
+						</content>
+					</file>
+					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">