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

apache: Make sure to forward authentication credentials to FPM 

This is needed for basic authentication against the Icinga Web 2 API.
This commit is contained in:
Markus Frosch 2017-12-04 14:16:34 +01:00
parent eff3b7758c
commit 93464f5cd0
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ Alias {urlPath} "{documentRoot}"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4 # Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4> #<IfVersion < 2.4>
# # Forward PHP requests to FPM # # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <LocationMatch "^{urlPath}/(.*\.php)$"> # <LocationMatch "^{urlPath}/(.*\.php)$">
# ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1" # ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1"
# </LocationMatch> # </LocationMatch>
@ -65,6 +66,7 @@ Alias {urlPath} "{documentRoot}"
# is greater than or equal to 2.4 # is greater than or equal to 2.4
# <IfVersion >= 2.4> # <IfVersion >= 2.4>
# # Forward PHP requests to FPM # # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <FilesMatch "\.php$"> # <FilesMatch "\.php$">
# SetHandler "proxy:fcgi://127.0.0.1:9000" # SetHandler "proxy:fcgi://127.0.0.1:9000"
# ErrorDocument 503 {urlPath}/error_unavailable.html # ErrorDocument 503 {urlPath}/error_unavailable.html

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

@ -3,6 +3,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4 # Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4> #<IfVersion < 2.4>
# # Forward PHP requests to FPM # # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <LocationMatch "^{urlPath}/(.*\.php)$"> # <LocationMatch "^{urlPath}/(.*\.php)$">
# ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1" # ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1"
# </LocationMatch> # </LocationMatch>
@ -50,6 +51,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
# is greater than or equal to 2.4 # is greater than or equal to 2.4
# <IfVersion >= 2.4> # <IfVersion >= 2.4>
# # Forward PHP requests to FPM # # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <FilesMatch "\.php$"> # <FilesMatch "\.php$">
# SetHandler "proxy:fcgi://127.0.0.1:9000" # SetHandler "proxy:fcgi://127.0.0.1:9000"
# ErrorDocument 503 {urlPath}/error_unavailable.html # ErrorDocument 503 {urlPath}/error_unavailable.html

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

@ -2,6 +2,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
<IfVersion < 2.4> <IfVersion < 2.4>
# Forward PHP requests to FPM # Forward PHP requests to FPM
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
<LocationMatch "^/icingaweb2/(.*\.php)$"> <LocationMatch "^/icingaweb2/(.*\.php)$">
ProxyPassMatch "fcgi://127.0.0.1:9000/usr/share/icingaweb2/public/$1" ProxyPassMatch "fcgi://127.0.0.1:9000/usr/share/icingaweb2/public/$1"
</LocationMatch> </LocationMatch>
@ -47,6 +48,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
<IfVersion >= 2.4> <IfVersion >= 2.4>
# Forward PHP requests to FPM # Forward PHP requests to FPM
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
<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 /icingaweb2/error_unavailable.html