aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--config/vhosts/vhosts.inc5
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 5 insertions, 6 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";
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 262000ed..e736bd46 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -312,7 +312,7 @@
<category>Services</category>
<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
- <version>0.7.4</version>
+ <version>0.7.5</version>
<status>Stable</status>
<required_version>2.2</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 202da303..c0879609 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -449,7 +449,7 @@
<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>0.7.4</version>
+ <version>0.7.5</version>
<status>Stable</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 276f40e7..b0c14de6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -436,7 +436,7 @@
<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>0.7.4</version>
+ <version>0.7.5</version>
<status>Stable</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>