Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

 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;
@@ -1387,6 +1387,7 @@
      exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
   }

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

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

      $dist_init_scripts = $conf['init_scripts'];
@@ -1713,6 +1715,7 @@
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

      wf($install_dir.'/interface/lib/'.$configfile, $content);

@@ -1737,6 +1740,7 @@
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      $content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

      wf($install_dir.'/server/lib/'.$configfile, $content);