From bab36b51e6cf65db4557125a11ec584e005fefaa Mon Sep 17 00:00:00 2001
From: agoston <agoston@ispconfig3>
Date: Thu, 03 Dec 2009 10:17:24 -0500
Subject: [PATCH] - removed number from conf[version] because it is the version of baselayout - as apache 2.2.14 the ssl directory moved to /etc/ssl/apache2 from /etc/apache2/ssl
---
server/plugins-available/apache2_plugin.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 995cd21..5b69403 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -83,7 +83,7 @@
if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
$ssl_dir = $data["new"]["document_root"]."/ssl";
- $domain = $data["new"]["domain"];
+ $domain = $data["new"]["ssl_domain"];
$key_file = $ssl_dir.'/'.$domain.".key.org";
$key_file2 = $ssl_dir.'/'.$domain.".key";
$csr_file = $ssl_dir.'/'.$domain.".csr";
@@ -144,8 +144,8 @@
exec("chmod 400 $key_file2");
@unlink($config_file);
@unlink($rand_file);
- $ssl_request = file_get_contents($csr_file);
- $ssl_cert = file_get_contents($crt_file);
+ $ssl_request = $app->db->quote(file_get_contents($csr_file));
+ $ssl_cert = $app->db->quote(file_get_contents($crt_file));
/* Update the DB of the (local) Server */
$app->db->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data["new"]["domain"]."'");
$app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
@@ -554,6 +554,7 @@
$vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
$vhost_data["web_basedir"] = $web_config["website_basedir"];
$vhost_data["security_level"] = $web_config["security_level"];
+ $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
// Check if a SSL cert exists
$ssl_dir = $data["new"]["document_root"]."/ssl";
--
Gitblit v1.9.1