Added possibility to add backup files to webspace quota (setting only)

Dominik Müller

2015-01-09 d453c16036dd5a4ff1dfb6c0dd4c3ea8f315b03a

 install/install.php

@@ -271,8 +271,10 @@
   $inst->configure_spamassassin();

   //* Configure Amavis
   swriteln('Configuring Amavisd');
   $inst->configure_amavis();
   if($conf['amavis']['installed'] == true) {
      swriteln('Configuring Amavisd');
      $inst->configure_amavis();
   }

   //* Configure Getmail
   swriteln('Configuring Getmail');
@@ -315,10 +317,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) {
@@ -362,7 +371,7 @@
   $inst->install_crontab();

   swriteln('Restarting services ...');
   if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
   if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
   if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
   if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
   if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));
@@ -388,7 +397,8 @@
   if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') system($inst->getinitcommand($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'] != '') system($inst->getinitcommand($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'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');

} else {

   //* In expert mode, we select the services in the following steps, only db is always available
@@ -614,6 +624,11 @@
         $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();
      }
      */
   }