ftimme
2011-10-11 81d79a79e4b29e9314b64b2e4c49b48ae8319767
install/install.php
@@ -247,18 +247,10 @@
   $inst->configure_apps_vhost();
    
   //* Configure Firewall
   //** Configure Firewall
   if($conf['ufw']['installed'] == true) {
      //* Configure UFW Firewall
      $conf['services']['firewall'] = true;
      swriteln('Configuring UFW Firewall');
      $inst->configure_ufw_firewall();
   } else {
      //* Configure Bastille Firewall
      $conf['services']['firewall'] = true;
      swriteln('Configuring Bastille Firewall');
      $inst->configure_firewall();
   }
   //* Configure Bastille Firewall
   $conf['services']['firewall'] = true;
   swriteln('Configuring Bastille Firewall');
   $inst->configure_firewall();
    //* Configure Fail2ban
    if($conf['fail2ban']['installed'] == true) {
@@ -539,17 +531,18 @@
   
   //** Configure Firewall
   if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {   
      if($conf['bastille']['installed'] == true) {
      //if($conf['bastille']['installed'] == true) {
         //* Configure Bastille Firewall
         $conf['services']['firewall'] = true;
         swriteln('Configuring Bastille Firewall');
         $inst->configure_firewall();
      } elseif($conf['ufw']['installed'] == true) {
      /*} elseif($conf['ufw']['installed'] == true) {
         //* Configure Ubuntu Firewall
         $conf['services']['firewall'] = true;
         swriteln('Configuring Ubuntu Firewall');
         $inst->configure_ufw_firewall();
      }
      */
   }
   
   //** Configure Firewall