From 4ae3a8568a1cd6ad89fd2ec12004c279bd3b8a4e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 15:19:55 +0200
Subject: [PATCH] RPM/httpd and php-fpm: Load error html if mod_proxy is
 disabled

refs #9669
---
 packages/files/httpd/icingaweb2.conf | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/files/httpd/icingaweb2.conf b/packages/files/httpd/icingaweb2.conf
index fb42bcb6b..fbd763593 100644
--- a/packages/files/httpd/icingaweb2.conf
+++ b/packages/files/httpd/icingaweb2.conf
@@ -1,6 +1,16 @@
 Alias /icingaweb2 "/usr/share/icingaweb2/public"
 
 <Directory "/usr/share/icingaweb2/public">
+    <IfModule !mod_rewrite.c>
+        DirectoryIndex error_norewrite.html
+        ErrorDocument 404 /error_norewrite.html
+    </IfModule>
+
+    <IfModule !mod_proxy_fgci.c>
+        DirectoryIndex error_noproxyfcgi.html
+        ErrorDocument 404 /error_noproxyfcgi.html
+    </IfModule>
+
     Options SymLinksIfOwnerMatch
     AllowOverride None
 
@@ -21,21 +31,14 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
 
     EnableSendfile Off
 
-    <IfModule mod_rewrite.c>
-        RewriteEngine on
-        RewriteBase /icingaweb2/
-        RewriteCond %{REQUEST_FILENAME} -s [OR]
-        RewriteCond %{REQUEST_FILENAME} -l [OR]
-        RewriteCond %{REQUEST_FILENAME} -d
-        RewriteRule ^.*$ - [NC,L]
-        RewriteRule ^.*$ index.php [NC,L]
-        DirectoryIndex index.php
-    </IfModule>
-
-    <IfModule !mod_rewrite.c>
-        DirectoryIndex error_norewrite.html
-        ErrorDocument 404 /error_norewrite.html
-    </IfModule>
+    RewriteEngine on
+    RewriteBase /icingaweb2/
+    RewriteCond %{REQUEST_FILENAME} -s [OR]
+    RewriteCond %{REQUEST_FILENAME} -l [OR]
+    RewriteCond %{REQUEST_FILENAME} -d
+    RewriteRule ^.*$ - [NC,L]
+    RewriteRule ^.*$ index.php [NC,L]
+    DirectoryIndex index.php
 
     <FilesMatch \.php$>
         SetHandler "proxy:unix:/run/php-fpm/icingaweb2.sock|fcgi://localhost/"