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

laking

2011-04-04 b6376411b01d5856d90604f5e7d94cf17d2ecc80

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

 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';

?>

 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';

?>

 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';



?>


 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';



?>


 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';

?>

 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';

?>

 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';;

?>

 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';

?>

 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

 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);
        

 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

 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');


 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


 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');