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

separate certificate and chainfile by newline, fixes #1307

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-23 15:14:41 +01:00
parent 94e63e78d1
commit c4fc03d7af
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/webserver/class.DomainSSL.php
View File

@@ -84,7 +84,7 @@ class DomainSSL {
if ($this->_settings['system']['webserver'] == 'lighttpd') { if ($this->_settings['system']['webserver'] == 'lighttpd') {
// put my.crt and my.key together for lighty. // put my.crt and my.key together for lighty.
$dom_certs['ssl_cert_file'] .= $dom_certs['ssl_key_file']; $dom_certs['ssl_cert_file'] = trim($dom_certs['ssl_cert_file'])."\n".trim($dom_certs['ssl_key_file'])."\n";
$ssl_files['ssl_key_file'] = ''; $ssl_files['ssl_key_file'] = '';
} }
@@ -98,7 +98,7 @@ class DomainSSL {
if ($dom_certs['ssl_cert_chainfile'] != '') { if ($dom_certs['ssl_cert_chainfile'] != '') {
if ($this->_settings['system']['webserver'] == 'nginx') { if ($this->_settings['system']['webserver'] == 'nginx') {
// put ca.crt in my.crt, as nginx does not support a separate chain file. // put ca.crt in my.crt, as nginx does not support a separate chain file.
$dom_certs['ssl_cert_file'] .= $dom_certs['ssl_cert_chainfile']; $dom_certs['ssl_cert_file'] = trim($dom_certs['ssl_cert_file'])."\n".trim($dom_certs['ssl_cert_chainfile'])."\n";
} else { } else {
$ssl_files['ssl_cert_chainfile'] = makeCorrectFile($sslcertpath.'/'.$domain['domain'].'_chain.pem'); $ssl_files['ssl_cert_chainfile'] = makeCorrectFile($sslcertpath.'/'.$domain['domain'].'_chain.pem');
} }