From eff3b7758c9d28beb2c76a52c02c69971d3344b7 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Mon, 4 Dec 2017 14:14:34 +0100
Subject: [PATCH] apache: Include FPM comments in regular Apache config

---
 .../setup/library/Setup/Webserver/Apache.php  |  3 ++-
 packages/files/apache/icingaweb2.conf         | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index bb401e6ca..eab908104 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -61,7 +61,8 @@ Alias {urlPath} "{documentRoot}"
         ErrorDocument 404 {urlPath}/error_norewrite.html
     </IfModule>
 
-# Remove comments if you want to use PHP FPM and your Apache version is greater than or equal to 2.4
+# Remove comments if you want to use PHP FPM and your Apache version
+# is greater than or equal to 2.4
 #    <IfVersion >= 2.4>
 #        # Forward PHP requests to FPM
 #        <FilesMatch "\.php$">
diff --git a/packages/files/apache/icingaweb2.conf b/packages/files/apache/icingaweb2.conf
index 7225f840f..428a094bc 100644
--- a/packages/files/apache/icingaweb2.conf
+++ b/packages/files/apache/icingaweb2.conf
@@ -1,5 +1,13 @@
 Alias /icingaweb2 "/usr/share/icingaweb2/public"
 
+# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
+#<IfVersion < 2.4>
+#    # Forward PHP requests to FPM
+#    <LocationMatch "^{urlPath}/(.*\.php)$">
+#        ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1"
+#    </LocationMatch>
+#</IfVersion>
+
 <Directory "/usr/share/icingaweb2/public">
     Options SymLinksIfOwnerMatch
     AllowOverride None
@@ -38,10 +46,13 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
         ErrorDocument 404 /icingaweb2/error_norewrite.html
     </IfModule>
 
-    # forwarding PHP requests to FPM
-    # remove comments if you want to use FPM
-    #<FilesMatch "\.php$">
-    #    SetHandler "proxy:fcgi://127.0.0.1:9000"
-    #    ErrorDocument 503 /icingaweb2/error_unavailable.html
-    #</FilesMatch>
+# Remove comments if you want to use PHP FPM and your Apache version
+# is greater than or equal to 2.4
+#    <IfVersion >= 2.4>
+#        # Forward PHP requests to FPM
+#        <FilesMatch "\.php$">
+#            SetHandler "proxy:fcgi://127.0.0.1:9000"
+#            ErrorDocument 503 {urlPath}/error_unavailable.html
+#        </FilesMatch>
+#    </IfVersion>
 </Directory>