Commit b6376411 authored by laking's avatar laking
Browse files

Update on certificte CA-signing. Moved config to control panel.

parent 47e2cbd5
...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond'; ...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/pki/CA';
?> ?>
...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond'; ...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/pki/CA';
?> ?>
...@@ -191,7 +191,5 @@ $conf['cron']['init_script'] = 'cron'; ...@@ -191,7 +191,5 @@ $conf['cron']['init_script'] = 'cron';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/ssl';
?> ?>
...@@ -191,7 +191,5 @@ $conf['cron']['init_script'] = 'cron'; ...@@ -191,7 +191,5 @@ $conf['cron']['init_script'] = 'cron';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/ssl';
?> ?>
...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond'; ...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'crond';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/pki/CA';
?> ?>
...@@ -203,6 +203,4 @@ $conf['cron']['crontab_dir'] = '/etc/cron.d'; ...@@ -203,6 +203,4 @@ $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['group'] = 'cron'; $conf['cron']['group'] = 'cron';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/ssl';
?> ?>
...@@ -184,8 +184,6 @@ $conf['vlogger']['config_dir'] = '/etc'; ...@@ -184,8 +184,6 @@ $conf['vlogger']['config_dir'] = '/etc';
//* cron //* cron
$conf['cron']['init_script'] = 'cron'; $conf['cron']['init_script'] = 'cron';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';;
$conf['CA-path'] = '/etc/ssl';
?> ?>
...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'cron'; ...@@ -186,6 +186,4 @@ $conf['cron']['init_script'] = 'cron';
$conf['cron']['crontab_dir'] = '/etc/cron.d'; $conf['cron']['crontab_dir'] = '/etc/cron.d';
$conf['cron']['wget'] = '/usr/bin/wget'; $conf['cron']['wget'] = '/usr/bin/wget';
$conf['CA-path'] = '/etc/ssl';
?> ?>
...@@ -690,10 +690,6 @@ class installer_dist extends installer_base { ...@@ -690,10 +690,6 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $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); wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because //* Create the config file for remote-actions (but only, if it does not exist, because
......
...@@ -660,10 +660,6 @@ class installer extends installer_base ...@@ -660,10 +660,6 @@ class installer extends installer_base
$this->write_config_file("$install_dir/interface/lib/$configfile", $content); $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 //* Create the config file for ISPConfig server
$this->write_config_file("$install_dir/server/lib/$configfile", $content); $this->write_config_file("$install_dir/server/lib/$configfile", $content);
......
...@@ -704,10 +704,6 @@ class installer_dist extends installer_base { ...@@ -704,10 +704,6 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $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); wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because //* Create the config file for remote-actions (but only, if it does not exist, because
......
...@@ -437,20 +437,6 @@ if($install_mode == 'standard') { ...@@ -437,20 +437,6 @@ if($install_mode == 'standard') {
swriteln('Configuring Firewall'); swriteln('Configuring Firewall');
$inst->configure_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 :-) //** Configure ISPConfig :-)
if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') { if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') {
swriteln('Installing ISPConfig'); swriteln('Installing ISPConfig');
......
...@@ -1348,12 +1348,8 @@ class installer_base { ...@@ -1348,12 +1348,8 @@ class installer_base {
$content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{server_id}', $conf['server_id'], $content);
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $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); wf($install_dir.'/server/lib/'.$configfile, $content);
//* Create the config file for remote-actions (but only, if it does not exist, because //* Create the config file for remote-actions (but only, if it does not exist, because
......
...@@ -303,20 +303,6 @@ if($reconfigure_services_answer == 'yes') { ...@@ -303,20 +303,6 @@ if($reconfigure_services_answer == 'yes') {
//} //}
} }
//** 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 //** Configure ISPConfig
swriteln('Updating ISPConfig'); swriteln('Updating ISPConfig');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment