/etc/localtime can be a relative symlink

Marc Schütz

2014-03-11 ff68e56525cc0d1f179ccd937126e65daa0aee22

 install/update.php

@@ -66,6 +66,9 @@
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));

//** Include the templating lib
require_once 'lib/classes/tpl.inc.php';

//** Check for ISPConfig 2.x versions
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
   die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
@@ -289,8 +292,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');
@@ -344,10 +349,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();
      }
   }

@@ -436,7 +446,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');
   }
}