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

respect listen_statement = 0 setting from ipsandports-table in nginx - use with caution; fixes #1076

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-15 09:05:53 +02:00
parent 25b4826395
commit 3d246d7926
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,8 +172,12 @@ class nginx
/** /**
* this HAS to be set for the default host in nginx or else no vhost will work * this HAS to be set for the default host in nginx or else no vhost will work
* edit: as of #1076 this is optional but should be deactivated with CARE as it
* might break a lot
*/ */
$this->nginx_data[$vhost_filename].= "\t". 'listen ' . $ip . ':' . $port . ' default;' . "\n"; if ($row_ipsandports['listen_statement'] == '1') {
$this->nginx_data[$vhost_filename].= "\t". 'listen ' . $ip . ':' . $port . ' default;' . "\n";
}
if($row_ipsandports['vhostcontainer'] == '1') if($row_ipsandports['vhostcontainer'] == '1')
{ {
@@ -235,10 +239,12 @@ class nginx
{ {
$this->nginx_data[$vhost_filename].= "\t" . 'ssl on;' . "\n"; $this->nginx_data[$vhost_filename].= "\t" . 'ssl on;' . "\n";
$this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate ' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . ';' . "\n"; $this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate ' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . ';' . "\n";
$this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate_key ' .makeCorrectFile($row_ipsandports['ssl_key_file']) . ';' . "\n";
if ($row_ipsandports['ssl_key_file'] != '') {
if($row_ipsandports['ssl_ca_file'] != '') $this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate_key ' .makeCorrectFile($row_ipsandports['ssl_key_file']) . ';' . "\n";
{ }
if ($row_ipsandports['ssl_ca_file'] != '') {
$this->nginx_data[$vhost_filename].= 'ssl_client_certificate ' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . ';' . "\n"; $this->nginx_data[$vhost_filename].= 'ssl_client_certificate ' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . ';' . "\n";
} }
} }
@@ -414,8 +420,15 @@ class nginx
// open vhost-container // open vhost-container
$vhost_content.= 'server { ' . "\n"; $vhost_content.= 'server { ' . "\n";
// listening statement (required) /**
$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n"; * listening statement (required)
* edit: as of #1076 this is optional but should be deactivated with CARE as it
* might break a lot
*/
if ($ipsandport['listen_statement'] == '1') {
$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
}
// get all server-names // get all server-names
$vhost_content.= $this->getServerNames($domain); $vhost_content.= $this->getServerNames($domain);