aboutsummaryrefslogtreecommitdiffstats
path: root/config/vhosts/vhosts.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-10-20 10:53:11 -0500
committerRenato Botelho <garga@FreeBSD.org>2014-10-20 10:53:11 -0500
commit8177bf04db3ab1b756b36c0fb0f0659e8d85388a (patch)
treef69bdcab49cadb249ee71a3fa8e662facca097a0 /config/vhosts/vhosts.inc
parentd5cf7798a35fe6b031c3d1bc72a0d0d0a94ba7f8 (diff)
parent34654a2c5579e545e2f590a838af394949861b32 (diff)
downloadpfsense-packages-8177bf04db3ab1b756b36c0fb0f0659e8d85388a.tar.gz
pfsense-packages-8177bf04db3ab1b756b36c0fb0f0659e8d85388a.tar.bz2
pfsense-packages-8177bf04db3ab1b756b36c0fb0f0659e8d85388a.zip
Merge pull request #718 from b1-systems/master
Diffstat (limited to 'config/vhosts/vhosts.inc')
-rw-r--r--config/vhosts/vhosts.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index aa602fdd..d0b14652 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -331,7 +331,7 @@ function vhosts_sync_package_php()
if (strlen($rowhelper['certificate']) > 0 && strlen($rowhelper['privatekey']) > 0) {
$pem_file = "/var/etc/cert-vhosts-".$ipaddress."-".$port.".pem";
$fout = fopen($pem_file,"w");
- fwrite($fout, $certificate.$privatekey);
+ fwrite($fout, $certificate.PHP_EOL.$privatekey);
fclose($fout);
$tmp .= " ssl.pemfile = \"".$pem_file."\"\n";
$tmp .= " ssl.engine = \"enable\"\n";
@@ -491,7 +491,6 @@ function vhosts_sync_package_php()
$tmp .= "\n";
$tmp .= "## modules to load\n";
$tmp .= "server.modules = (\n";
- $tmp .= " \"mod_accesslog\",\n";
$tmp .= " \"mod_access\", \"mod_accesslog\",\n";
$tmp .= " \"mod_fastcgi\", \"mod_cgi\",\"mod_rewrite\"\n";
$tmp .= " )\n";
@@ -615,7 +614,7 @@ function vhosts_sync_package_php()
$pem_file = "/var/etc/cert-vhosts-".$ipaddress."-".$port.".pem";
$fout = fopen($pem_file,"w");
//echo $certificate; //exit;
- fwrite($fout, $certificate.$privatekey);
+ fwrite($fout, $certificate.PHP_EOL.$privatekey);
fclose($fout);
$tmp .= "## ssl configuration\n";
$tmp .= "ssl.pemfile = \"".$pem_file."\"\n";