tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

apache: Include FPM comments in regular Apache config

Browse Source
This commit is contained in:
Markus Frosch 2017-12-04 14:14:34 +01:00
parent 208e49a616
commit eff3b7758c
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,8 @@ Alias {urlPath} "{documentRoot}"
ErrorDocument 404 {urlPath}/error_norewrite.html ErrorDocument 404 {urlPath}/error_norewrite.html
</IfModule> </IfModule>
# Remove comments if you want to use PHP FPM and your Apache version is greater than or equal to 2.4 # Remove comments if you want to use PHP FPM and your Apache version
# is greater than or equal to 2.4
# <IfVersion >= 2.4> # <IfVersion >= 2.4>
# # Forward PHP requests to FPM # # Forward PHP requests to FPM
# <FilesMatch "\.php$"> # <FilesMatch "\.php$">

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

@ -1,5 +1,13 @@
Alias /icingaweb2 "/usr/share/icingaweb2/public" Alias /icingaweb2 "/usr/share/icingaweb2/public"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4>
# # Forward PHP requests to FPM
# <LocationMatch "^{urlPath}/(.*\.php)$">
# ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1"
# </LocationMatch>
#</IfVersion>
<Directory "/usr/share/icingaweb2/public"> <Directory "/usr/share/icingaweb2/public">
Options SymLinksIfOwnerMatch Options SymLinksIfOwnerMatch
AllowOverride None AllowOverride None
@ -38,10 +46,13 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
ErrorDocument 404 /icingaweb2/error_norewrite.html ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule> </IfModule>
# forwarding PHP requests to FPM # Remove comments if you want to use PHP FPM and your Apache version
# remove comments if you want to use FPM # is greater than or equal to 2.4
# <IfVersion >= 2.4>
# # Forward PHP requests to 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>
# </IfVersion>
</Directory> </Directory>