maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

put index back in location-context; try_files not really necessary if not using PHP, also eases use of proxy_pass users; thx to karstenk

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-06-20 09:55:27 +02:00
parent 77aa58a0a3
commit 7ec777c9dd
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -671,7 +671,7 @@ class nginx extends HttpConfigBase {
$path_options .= "\t\t" . 'autoindex on;' . "\n"; $path_options .= "\t\t" . 'autoindex on;' . "\n";
$this->vhost_root_autoindex = false; $this->vhost_root_autoindex = false;
} }
// $path_options.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n";
// check if we have a htpasswd for this path // check if we have a htpasswd for this path
// (damn nginx does not like more than one // (damn nginx does not like more than one
// 'location'-part with the same path) // 'location'-part with the same path)
@@ -859,24 +859,17 @@ class nginx extends HttpConfigBase {
$this->_deactivated = false; $this->_deactivated = false;
} }
$webroot_text .= "\n\t".'location / {'."\n";
if ($domain['phpenabled'] == '1') if ($domain['phpenabled'] == '1')
{ {
$webroot_text .= "\t" . 'index index.php index.html index.htm;'."\n"; $webroot_text .= "\t" . 'index index.php index.html index.htm;'."\n";
$webroot_text .= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n";
} }
else else
{ {
$webroot_text .= "\t" . 'index index.html index.htm;'."\n"; $webroot_text .= "\t" . 'index index.html index.htm;'."\n";
} }
$webroot_text .= "\n\t".'location / {'."\n";
$webroot_text .= "\t\t" . 'try_files $uri $uri/';
if ($domain['phpenabled'] == '1')
{
$webroot_text .= ' @rewrites;'."\n";
}
else
{
$webroot_text .= ";\n";
}
if ($this->vhost_root_autoindex) { if ($this->vhost_root_autoindex) {
$webroot_text .= "\t\t".'autoindex on;'."\n"; $webroot_text .= "\t\t".'autoindex on;'."\n";