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

Fixed missing php configuration, fixes #990

Browse Source 
Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
This commit is contained in:
Andreas Burchert (scarya)
2011-12-12 16:45:26 +01:00
parent 92c54703c5
commit 1c9023cdaf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,9 +487,9 @@ class nginx
if($this->vhost_root_autoindex) { if($this->vhost_root_autoindex) {
$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" . 'index index.php index.html index.htm;'."\n"; $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
// 'location'-part with the same path) // 'location'-part with the same path)
@@ -521,7 +521,7 @@ class nginx
if($this->vhost_root_autoindex) { if($this->vhost_root_autoindex) {
$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" . 'index index.php index.html index.htm;'."\n"; $path_options.= "\t\t" . 'index index.php index.html index.htm;'."\n";
} }
// } // }
@@ -557,7 +557,7 @@ class nginx
{ {
foreach($htpasswds as $idx => $single) foreach($htpasswds as $idx => $single)
{ {
//if($single['path'] != "/") //if($single['path'] != "/")
//{ //{
switch($single['path']) switch($single['path'])
{ {
@@ -622,9 +622,9 @@ class nginx
$phpopts.= "\t\t".'try_files $uri =404;'."\n"; $phpopts.= "\t\t".'try_files $uri =404;'."\n";
$phpopts.= "\t\t".'fastcgi_split_path_info ^(.+\.php)(/.+)$;'."\n"; $phpopts.= "\t\t".'fastcgi_split_path_info ^(.+\.php)(/.+)$;'."\n";
$phpopts.= "\t\t".'fastcgi_index index.php;'."\n"; $phpopts.= "\t\t".'fastcgi_index index.php;'."\n";
//$phpopts.= "\t\t".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n"; $phpopts.= "\t\t".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n";
//$phpopts.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n"; $phpopts.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";
//$phpopts.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n"; $phpopts.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
if ($domain['ssl'] == '1' && $ssl_vhost) { if ($domain['ssl'] == '1' && $ssl_vhost) {
$phpopts.= "\t\t".'fastcgi_param HTTPS on;'."\n"; $phpopts.= "\t\t".'fastcgi_param HTTPS on;'."\n";
} }
@@ -652,7 +652,7 @@ class nginx
$webroot_text.= "\t".'location / {'."\n"; $webroot_text.= "\t".'location / {'."\n";
$webroot_text.= "\t\t".'index index.php index.html index.htm;'."\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) {
$webroot_text.= "\t\t".'autoindex on;'."\n"; $webroot_text.= "\t\t".'autoindex on;'."\n";