tyler.durden/rpm-icingaweb2
1
0
Fork 0
mirror of https://git.icinga.com/packaging/rpm-icingaweb2.git synced 2025-07-30 17:34:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

icingaweb2: Remove Apache FPM patches for >= 2.5.1

Browse Source
This commit is contained in:
Markus Frosch 2017-12-18 15:18:09 +01:00
parent cd7506ee01
commit 1592bf13ba
3 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
icingaweb2-fix-apache-fpm-config.patch
View File

@ -1,35 +0,0 @@
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

40
icingaweb2-fix-apache22-fpm-config.patch
View File

@ -1,40 +0,0 @@
commit ae86dd298706b20d58200a49d04d56bd8c1b0419
Author: Eric Lippmann <eric.lippmann@icinga.com>
Date: Wed Nov 29 14:31:18 2017 +0100
FPM Config: Support Apache < 2.4
diff --git a/packages/files/apache/icingaweb2.fpm.conf b/packages/files/apache/icingaweb2.fpm.conf
index fce026e45..9f01c214b 100644
--- a/packages/files/apache/icingaweb2.fpm.conf
+++ b/packages/files/apache/icingaweb2.fpm.conf
@@ -1,5 +1,12 @@
Alias /icingaweb2 "/usr/share/icingaweb2/public"
+<IfVersion < 2.4>
+ # Forward PHP requests to FPM
+ <LocationMatch "^/icingaweb2/(.*\.php)$">
+ ProxyPassMatch "fcgi://127.0.0.1:9000/usr/share/icingaweb2/public/$1"
+ </LocationMatch>
+</IfVersion>
+
<Directory "/usr/share/icingaweb2/public">
Options SymLinksIfOwnerMatch
AllowOverride None
@@ -38,9 +45,11 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule>
- # Forward PHP requests to FPM
- <FilesMatch "\.php$">
- SetHandler "proxy:fcgi://127.0.0.1:9000"
- ErrorDocument 503 /icingaweb2/error_unavailable.html
- </FilesMatch>
+ <IfVersion >= 2.4>
+ # Forward PHP requests to FPM
+ <FilesMatch "\.php$">
+ SetHandler "proxy:fcgi://127.0.0.1:9000"
+ ErrorDocument 503 /icingaweb2/error_unavailable.html
+ </FilesMatch>
+ </IfVersion>
</Directory>

2
icingaweb2.spec
View File

@ -10,8 +10,6 @@ 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
Patch1: icingaweb2-fix-apache22-fpm-config.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Packager: Icinga Team <info@icinga.com>