Icinga Web 2: Fix Apache FPM config

icingaweb2-fix-apache-fpm-config.patch

@@ -0,0 +1,35 @@
+commit 65ea398ff43bdae24055390e1686c049068a367e
+Author: Eric Lippmann <eric.lippmann@icinga.com>
+Date:   Tue Nov 28 09:12:51 2017 +0100
+
+    Remove superfluous LocationMatch block from the Apache FPM config
+
+diff --git a/packages/files/apache/icingaweb2.fpm.conf b/packages/files/apache/icingaweb2.fpm.conf
+index defdf2bbb..fce026e45 100644
+--- a/packages/files/apache/icingaweb2.fpm.conf
++++ b/packages/files/apache/icingaweb2.fpm.conf
+@@ -1,15 +1,5 @@
+ Alias /icingaweb2 "/usr/share/icingaweb2/public"
+ 
+-# forwarding PHP requests to FPM
+-<LocationMatch "^/icingaweb2/(.*\.php)$">
+-    ProxyPassMatch "fcgi://127.0.0.1:9000/usr/share/icingaweb2/public/$1"
+-    <IfModule mod_authz_core.c>
+-        # Apache 2.4
+-        ProxyErrorOverride on
+-        ErrorDocument 503 /icingaweb2/error_unavailable.html
+-    </IfModule>
+-</LocationMatch>
+-
+ <Directory "/usr/share/icingaweb2/public">
+     Options SymLinksIfOwnerMatch
+     AllowOverride None
+@@ -48,7 +38,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
+         ErrorDocument 404 /icingaweb2/error_norewrite.html
+     </IfModule>
+ 
+-    # forwarding PHP requests to FPM
++    # Forward PHP requests to FPM
+     <FilesMatch "\.php$">
+         SetHandler "proxy:fcgi://127.0.0.1:9000"
+         ErrorDocument 503 /icingaweb2/error_unavailable.html

icingaweb2.spec

@@ -10,6 +10,7 @@ Group:          Applications/System
 License:        GPLv2+ and MIT and BSD
 URL:            https://icinga.com
 Source0:        https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
+Patch0:         icingaweb2-fix-apache-fpm-config.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 Packager:       Icinga Team <info@icinga.com>
@@ -232,6 +233,7 @@ Icinga Web 2's fork of Zend Framework 1
 
 %prep
 %setup -q
+%patch0 -p1
 %if 0%{?use_selinux}
 mkdir selinux
 cp -p packages/selinux/icingaweb2.{fc,if,te} selinux
@@ -412,7 +414,10 @@ fi
 %{basedir}/library/vendor/Zend
 
 %changelog
-* Mon Nov 11 2017 Markus Frosch <markus.frosch@icinga.com> 2.5.0-1
+* Tue Nov 28 2017 Eric Lippmann <eric.lippmann@icinga.com> 2.5.0-1
+- Add patch to fix Apache FPM config
+
+* Mon Nov 27 2017 Markus Frosch <markus.frosch@icinga.com> 2.5.0-1
 - Update to 2.5.0
 - All packages now require PHP >= 5.6
 - [EPEL 6 + 7] We now require PHP 7 from SCL packages, php-fpm as runtime engine