tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ErrorDocument prefix for the Apache webserver

This commit is contained in:
Markus Frosch 2017-11-17 11:41:04 +01:00
parent dd8aaec7cf
commit 0a3ab14ca4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/setup/library/Setup/Webserver/Apache.php
View File

@ -53,14 +53,14 @@ Alias {urlPath} "{documentRoot}"
<IfModule !mod_rewrite.c> <IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html DirectoryIndex error_norewrite.html
ErrorDocument 404 /error_norewrite.html ErrorDocument 404 {urlPath}/error_norewrite.html
</IfModule> </IfModule>
# forwarding PHP requests to FPM # forwarding PHP requests to FPM
# remove comments if you want to use FPM # remove comments if you want to use FPM
#<FilesMatch "\.php$"> #<FilesMatch "\.php$">
# SetHandler "proxy:fcgi://127.0.0.1:9000" # SetHandler "proxy:fcgi://127.0.0.1:9000"
# ErrorDocument 503 /icingaweb2/error_unavailable.html # ErrorDocument 503 {urlPath}/error_unavailable.html
#</FilesMatch> #</FilesMatch>
</Directory> </Directory>
EOD; EOD;

2
packages/files/apache/icingaweb2.conf
View File

@ -35,7 +35,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
<IfModule !mod_rewrite.c> <IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html DirectoryIndex error_norewrite.html
ErrorDocument 404 /error_norewrite.html ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule> </IfModule>
# forwarding PHP requests to FPM # forwarding PHP requests to FPM

2
packages/files/apache/icingaweb2.fpm.conf
View File

@ -45,7 +45,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
<IfModule !mod_rewrite.c> <IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html DirectoryIndex error_norewrite.html
ErrorDocument 404 /error_norewrite.html ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule> </IfModule>
# forwarding PHP requests to FPM # forwarding PHP requests to FPM