From 1592bf13bae18686d0f1f2c1c72dee614fa128c2 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Mon, 18 Dec 2017 15:18:09 +0100
Subject: [PATCH] icingaweb2: Remove Apache FPM patches for >= 2.5.1

---
 icingaweb2-fix-apache-fpm-config.patch   | 35 ---------------------
 icingaweb2-fix-apache22-fpm-config.patch | 40 ------------------------
 icingaweb2.spec                          |  2 --
 3 files changed, 77 deletions(-)
 delete mode 100644 icingaweb2-fix-apache-fpm-config.patch
 delete mode 100644 icingaweb2-fix-apache22-fpm-config.patch

diff --git a/icingaweb2-fix-apache-fpm-config.patch b/icingaweb2-fix-apache-fpm-config.patch
deleted file mode 100644
index cbe33c2..0000000
--- a/icingaweb2-fix-apache-fpm-config.patch
+++ /dev/null
@@ -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
diff --git a/icingaweb2-fix-apache22-fpm-config.patch b/icingaweb2-fix-apache22-fpm-config.patch
deleted file mode 100644
index 1b95797..0000000
--- a/icingaweb2-fix-apache22-fpm-config.patch
+++ /dev/null
@@ -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>
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 5fc9dc0..c539f28 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -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>