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

Merge pull request #310 from Churro/froxlorMerge_fe8093f

Browse Source 
Nginx: Avoid multiple index directives (common pitfall)
This commit is contained in:
Michael Kaufmann
2016-02-21 08:07:58 +01:00
parent 11b3ac67b0 1ace011ad2
commit b5e739620d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,8 +178,8 @@ class nginx extends HttpConfigBase {
} }
$this->nginx_data[$vhost_filename] .= "\t".'root '.$mypath.';'."\n"; $this->nginx_data[$vhost_filename] .= "\t".'root '.$mypath.';'."\n";
$this->nginx_data[$vhost_filename] .= "\t".'index index.php index.html index.htm;'."\n\n";
$this->nginx_data[$vhost_filename] .= "\t".'location / {'."\n"; $this->nginx_data[$vhost_filename] .= "\t".'location / {'."\n";
$this->nginx_data[$vhost_filename] .= "\t\t".'index index.php index.html index.htm;'."\n";
$this->nginx_data[$vhost_filename] .= "\t".'}'."\n"; $this->nginx_data[$vhost_filename] .= "\t".'}'."\n";
if ($row_ipsandports['specialsettings'] != '') { if ($row_ipsandports['specialsettings'] != '') {
@@ -665,9 +665,6 @@ 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;
} }
else {
$path_options.= "\t\t" . 'index index.php index.html index.htm;'."\n";
}
// $path_options.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n"; // $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
@@ -701,9 +698,6 @@ 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;
} }
else {
$path_options .= "\t\t" . 'index index.php index.html index.htm;'."\n";
}
$path_options .= "\t".'} ' . "\n"; $path_options .= "\t".'} ' . "\n";
} }
// } // }
@@ -848,8 +842,8 @@ class nginx extends HttpConfigBase {
$this->_deactivated = false; $this->_deactivated = false;
} }
$webroot_text .= "\t" . 'index index.php index.html index.htm;'."\n";
$webroot_text .= "\n\t".'location / {'."\n"; $webroot_text .= "\n\t".'location / {'."\n";
$webroot_text .= "\t\t".'index index.php index.html index.htm;'."\n";
$webroot_text .= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n"; $webroot_text .= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n";
if ($this->vhost_root_autoindex) { if ($this->vhost_root_autoindex) {