FS#2615 - Fix up ufw installation code - This makes ufw the default if it...

hellkat

2013-01-10 2de9fd788dff049bd9c154e2ccea37707229fc05

FS#2615 - Fix up ufw installation code
  - This makes ufw the default if it's found

 install/autoupdate.php

@@ -285,7 +285,7 @@
//if(@is_dir('/etc/Bastille')) {
//* Configure Firewall
swriteln('Configuring Firewall');
$inst->configure_firewall();
$inst->configure_bastille_firewall();
//}

//** Configure ISPConfig

 install/install.php

@@ -257,10 +257,17 @@
    $inst->configure_apps_vhost();
    
    //* Configure Firewall
    //* Configure Bastille Firewall
    $conf['services']['firewall'] = true;
    swriteln('Configuring Bastille Firewall');
    $inst->configure_firewall();
    if($conf['ufw']['installed'] == true) { 
        //* Configure Ubuntu Firewall
        $conf['services']['firewall'] = true;
        swriteln('Configuring Ubuntu Firewall');
        $inst->configure_ufw_firewall();
    } else {
        //* Configure Bastille Firewall
        $conf['services']['firewall'] = true;
        swriteln('Configuring Bastille Firewall');
        $inst->configure_bastille_firewall();
    }

    //* Configure Fail2ban
    if($conf['fail2ban']['installed'] == true) {
@@ -328,7 +335,7 @@
    if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))                    system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
    //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script']))                    system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
    if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script']))                    system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
    //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
    if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}else{
    
    //* In expert mode, we select the services in the following steps, only db is always available
@@ -544,18 +551,17 @@
    
    //** Configure Firewall
    if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {    
        //if($conf['bastille']['installed'] == true) {
            //* Configure Bastille Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Bastille Firewall');
            $inst->configure_firewall();
        /*} elseif($conf['ufw']['installed'] == true) {
        if($conf['ufw']['installed'] == true) {
            //* Configure Ubuntu Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Ubuntu Firewall');
            $inst->configure_ufw_firewall();
        } else {
            //* Configure Bastille Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Bastille Firewall');
            $inst->configure_bastille_firewall();
        }
        */
    }
    
    //** Configure Firewall
@@ -622,4 +628,4 @@
echo "Installation completed.\n";


?>
?>

 install/lib/installer_base.lib.php

@@ -132,7 +132,7 @@
        if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true;
        if(is_installed('squid')) $conf['squid']['installed'] = true;
        if(is_installed('nginx')) $conf['nginx']['installed'] = true;
        // if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
        if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
        if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
        if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
        if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
@@ -1349,7 +1349,6 @@
        exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
    }

    /*
    public function configure_ufw_firewall()
    {
        $configfile = 'ufw.conf';
@@ -1359,9 +1358,8 @@
        exec('chmod 600 /etc/ufw/ufw.conf');
        exec('chown root:root /etc/ufw/ufw.conf');
    }
    */

    public function configure_firewall() {
    public function configure_bastille_firewall() {
        global $conf;

        $dist_init_scripts = $conf['init_scripts'];

 install/update.php

@@ -341,10 +341,15 @@

    
    if($conf['services']['firewall']) {
        if($conf['bastille']['installed'] == true) {
        if($conf['ufw']['installed'] == true) {
            //* Configure Ubuntu Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Ubuntu Firewall');
            $inst->configure_ufw_firewall();
        } else {
            //* Configure Bastille Firewall
            swriteln('Configuring Bastille Firewall');
            $inst->configure_firewall();
            $inst->configure_bastille_firewall();
        }
    }
    
@@ -426,7 +431,7 @@
    }
    
    if($conf['services']['firewall']) {
        //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
        if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))                    system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
    }
}