From 44a5f8ab12068625d6daa58cc929f35925c9a2a7 Mon Sep 17 00:00:00 2001 From: Tobias Wolter Date: Fri, 10 Oct 2014 13:51:02 +0200 Subject: Fix missing newline in certificate files --- config/vhosts/vhosts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc index aa602fdd..015cd5d8 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"; @@ -615,7 +615,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"; -- cgit v1.2.3 From 7910028c9600388f2450d0912665325991c871c8 Mon Sep 17 00:00:00 2001 From: Tobias Wolter Date: Fri, 10 Oct 2014 14:01:15 +0200 Subject: Remove double acess log call --- config/vhosts/vhosts.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc index 015cd5d8..d0b14652 100644 --- a/config/vhosts/vhosts.inc +++ b/config/vhosts/vhosts.inc @@ -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"; -- cgit v1.2.3