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/dist/conf/centos53.conf.php | 2 -
install/dist/lib/fedora.lib.php | 4 --
install/dist/conf/fedora9.conf.php | 2 -
install/dist/lib/gentoo.lib.php | 4 --
install/dist/lib/opensuse.lib.php | 4 --
install/dist/conf/debian40.conf.php | 2 -
install/update.php | 14 -------
install/dist/conf/debian60.conf.php | 2 -
install/dist/conf/centos52.conf.php | 2 -
install/install.php | 14 -------
install/lib/installer_base.lib.php | 8 +---
install/dist/conf/opensuse110.conf.php | 4 -
install/dist/conf/opensuse112.conf.php | 2 -
install/dist/conf/gentoo.conf.php | 2 -
14 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php
index 3e4c289..8ff03ce 100644
--- a/install/dist/conf/centos52.conf.php
+++ b/install/dist/conf/centos52.conf.php
@@ -186,6 +186,4 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/pki/CA';
-
?>
diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php
index 3e4c289..8ff03ce 100644
--- a/install/dist/conf/centos53.conf.php
+++ b/install/dist/conf/centos53.conf.php
@@ -186,6 +186,4 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/pki/CA';
-
?>
diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php
index 5c62a41..35c4dea 100644
--- a/install/dist/conf/debian40.conf.php
+++ b/install/dist/conf/debian40.conf.php
@@ -191,7 +191,5 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/ssl';
-
?>
diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
index 6790fc6..6962adb 100644
--- a/install/dist/conf/debian60.conf.php
+++ b/install/dist/conf/debian60.conf.php
@@ -191,7 +191,5 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/ssl';
-
?>
diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php
index ac36a10..ea1affa 100644
--- a/install/dist/conf/fedora9.conf.php
+++ b/install/dist/conf/fedora9.conf.php
@@ -186,6 +186,4 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/pki/CA';
-
?>
diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php
index 018ab8f..cfb20a4 100644
--- a/install/dist/conf/gentoo.conf.php
+++ b/install/dist/conf/gentoo.conf.php
@@ -203,6 +203,4 @@
$conf['cron']['group'] = 'cron';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/ssl';
-
?>
diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php
index 82467e5..5839c05 100644
--- a/install/dist/conf/opensuse110.conf.php
+++ b/install/dist/conf/opensuse110.conf.php
@@ -184,8 +184,6 @@
//* cron
$conf['cron']['init_script'] = 'cron';
$conf['cron']['crontab_dir'] = '/etc/cron.d';
-$conf['cron']['wget'] = '/usr/bin/wget';
-
-$conf['CA-path'] = '/etc/ssl';
+$conf['cron']['wget'] = '/usr/bin/wget';;
?>
diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php
index 0b89c5b..88c1c6e 100644
--- a/install/dist/conf/opensuse112.conf.php
+++ b/install/dist/conf/opensuse112.conf.php
@@ -186,6 +186,4 @@
$conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget';
-$conf['CA-path'] = '/etc/ssl';
-
?>
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index ac563ec..56e7a04 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -690,10 +690,6 @@
$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);
-
wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 2a6816e..5beba09 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -660,10 +660,6 @@
$this->write_config_file("$install_dir/interface/lib/$configfile", $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);
-
//* Create the config file for ISPConfig server
$this->write_config_file("$install_dir/server/lib/$configfile", $content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 4a50e84..6a0fdbb 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -704,10 +704,6 @@
$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);
-
wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because
diff --git a/install/install.php b/install/install.php
index 7b7afed..a17e039 100644
--- a/install/install.php
+++ b/install/install.php
@@ -437,20 +437,6 @@
swriteln('Configuring Firewall');
$inst->configure_firewall();
}
-
- //** Configure CA
- if(strtolower($inst->simple_query('Should this installation use a local CA to default-sign certificates?',array('y','n'),'n')) == 'y') {
- $conf['CA-enabled'] = true;
- $conf['CA-path'] = $inst->free_query('Path to the CA folder: ', $conf['CA-path']);
- $conf['CA-pass'] = $inst->free_query('Root Certificate Passphrase', '');
- if(!is_file($conf['CA-path'].'/openssl.cnf'))
- {
- swriteln('ERROR. '.$conf['CA-path'].'/openssl.cnf not found.');
- $conf['CA-enabled'] = false;
- }
- //$inst->configure_ca();
- } else {$conf['CA-enabled'] = false;};
-
//** Configure ISPConfig :-)
if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') {
swriteln('Installing ISPConfig');
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
diff --git a/install/update.php b/install/update.php
index f5b2380..17f6c3c 100644
--- a/install/update.php
+++ b/install/update.php
@@ -303,20 +303,6 @@
//}
}
- //** Configure CA
- if(strtolower($inst->simple_query('Should this installation use a local CA to default-sign certificates?',array('y','n'),'n')) == 'y') {
- $conf['CA-enabled'] = true;
- $conf['CA-path'] = $inst->free_query('Path to the CA folder: ', $conf['CA-path']);
- $conf['CA-pass'] = $inst->free_query('Root Certificate Passphrase', '');
- if(!is_file($conf['CA-path'].'/openssl.cnf'))
- {
- swriteln('ERROR. '.$conf['CA-path'].'/openssl.cnf not found.');
- $conf['CA-enabled'] = false;
- }
- //$inst->configure_ca();
- } else {$conf['CA-enabled'] = false;};
-
-
//** Configure ISPConfig
swriteln('Updating ISPConfig');
--
Gitblit v1.9.1