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

icingacli setup config webserver apache: add trailing / to Alias dir

Browse Source 
if the Alias URI (e.g. /) has a trailing /. Otherwise Apache says 403.

(cherry picked from commit 0031108160ad440d6d2f172dba07c04e6f5af4a8)
This commit is contained in:
Alexander A. Klimov 2023-01-18 13:01:45 +01:00 committed by Johannes Meyer
parent 1bcf2627a8
commit 59415e117f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,12 +76,14 @@ abstract class Webserver
$searchTokens = array(
'{urlPath}',
'{documentRoot}',
'{aliasDocumentRoot}',
'{configDir}',
'{fpmUri}'
);
$replaceTokens = array(
$this->getUrlPath(),
$this->getDocumentRoot(),
preg_match('~/$~', $this->getUrlPath()) ? $this->getDocumentRoot() . '/' : $this->getDocumentRoot(),
$this->getConfigDir(),
$this->getFpmUri()
);

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

@ -16,7 +16,7 @@ class Apache extends Webserver
{
if (! $this->enableFpm) {
return <<<'EOD'
Alias {urlPath} "{documentRoot}"
Alias {urlPath} "{aliasDocumentRoot}"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4>
@ -79,7 +79,7 @@ Alias {urlPath} "{documentRoot}"
EOD;
} else {
return <<<'EOD'
Alias {urlPath} "{documentRoot}"
Alias {urlPath} "{aliasDocumentRoot}"
<IfVersion < 2.4>
# Forward PHP requests to FPM