rpm-icingaweb2/icingaweb2-fix-apache-fpm-c...

36 lines
1.3 KiB
Diff

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