From b6376411b01d5856d90604f5e7d94cf17d2ecc80 Mon Sep 17 00:00:00 2001
From: laking <laking@ispconfig3>
Date: Mon, 04 Apr 2011 18:18:08 -0400
Subject: [PATCH] Update on certificte CA-signing. Moved config to control panel.

---
 install/lib/installer_base.lib.php |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index a976128..f4df54e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1348,12 +1348,8 @@
 
 		$content = str_replace('{server_id}', $conf['server_id'], $content);
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
-		$content = str_replace('{language}', $conf['language'], $content);
-
-		if (!$conf['CA-enabled']) $content = str_replace('$conf[\'CA', '//$conf[\'CA', $content);
-		$content = str_replace('{CA-path}', $conf['CA-path'], $content);
-		$content = str_replace('{CA-pass}', $conf['CA-pass'], $content);
-
+		$content = str_replace('{language}', $conf['language'], $content);
+
 		wf($install_dir.'/server/lib/'.$configfile, $content);
 
 		//* Create the config file for remote-actions (but only, if it does not exist, because

--
Gitblit v1.9.1