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

add 'fastcgi_param HTTPS on' for nginx generally if ssl is enabled, refs #610

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-25 09:13:42 +01:00
parent c6afcc57d9
commit b325e50da1
2 changed files with 10 additions and 4 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

@@ -236,6 +236,9 @@ class nginx
$this->nginx_data[$vhost_filename].= "\t".'location ~ \.php$ {'."\n"; $this->nginx_data[$vhost_filename].= "\t".'location ~ \.php$ {'."\n";
$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_index index.php;'."\n"; $this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_index index.php;'."\n";
$this->nginx_data[$vhost_filename].= "\t\t".'include /etc/nginx/fastcgi_params;'."\n"; $this->nginx_data[$vhost_filename].= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
if ($row_ipsandports['ssl'] == '1') {
$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_param HTTPS on;'."\n";
}
$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n"; $this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";
if((int)$this->settings['phpfpm']['enabled'] == 1) if((int)$this->settings['phpfpm']['enabled'] == 1)
{ {
@@ -420,7 +423,7 @@ class nginx
if ($this->_deactivated == false) { if ($this->_deactivated == false) {
$vhost_content.= $this->create_pathOptions($domain); $vhost_content.= $this->create_pathOptions($domain);
// $vhost_content.= $this->create_htaccess($domain); // $vhost_content.= $this->create_htaccess($domain);
$vhost_content.= $this->composePhpOptions($domain); $vhost_content.= $this->composePhpOptions($domain, $ssl_vhost);
$vhost_content.= $this->getStats($domain); $vhost_content.= $this->getStats($domain);
if ($domain['specialsettings'] != "") { if ($domain['specialsettings'] != "") {
@@ -571,7 +574,7 @@ class nginx
return $returnval; return $returnval;
} }
protected function composePhpOptions($domain) protected function composePhpOptions($domain, $ssl_vhost = false)
{ {
$phpopts = ''; $phpopts = '';
if($domain['phpenabled'] == '1') if($domain['phpenabled'] == '1')
@@ -579,6 +582,9 @@ class nginx
$phpopts = "\t".'location ~ \.php$ {'."\n"; $phpopts = "\t".'location ~ \.php$ {'."\n";
$phpopts.= "\t\t".'fastcgi_index index.php;'."\n"; $phpopts.= "\t\t".'fastcgi_index index.php;'."\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) {
$phpopts.= "\t\t".'fastcgi_param HTTPS on;'."\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".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n"; $phpopts.= "\t\t".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n";
$phpopts.= "\t".'}'."\n"; $phpopts.= "\t".'}'."\n";

4
scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php
View File

@@ -28,7 +28,7 @@ if(@php_sapi_name() != 'cli'
class nginx_phpfpm extends nginx class nginx_phpfpm extends nginx
{ {
protected function composePhpOptions($domain) protected function composePhpOptions($domain, $ssl_vhost = false)
{ {
$php_options_text = ''; $php_options_text = '';
@@ -40,7 +40,7 @@ class nginx_phpfpm extends nginx
$php_options_text = "\t".'location ~ \.php$ {'."\n"; $php_options_text = "\t".'location ~ \.php$ {'."\n";
$php_options_text.= "\t\t".'fastcgi_index index.php;'."\n"; $php_options_text.= "\t\t".'fastcgi_index index.php;'."\n";
$php_options_text.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n"; $php_options_text.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
if ($domain['ssl'] == '1') { if ($domain['ssl'] == '1' && $ssl_vhost) {
$php_options_text.= "\t\t".'fastcgi_param HTTPS on;'."\n"; $php_options_text.= "\t\t".'fastcgi_param HTTPS on;'."\n";
} }
$php_options_text.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n"; $php_options_text.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";