chenged apache vhosts link-prefix

redray

2008-12-21 647c706c246567ce2c2d64e5d40bd929e0c8de52

 install/lib/installer_base.lib.php

@@ -699,6 +699,15 @@
         replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
      }
      
      //* Copy the ISPConfig configuration include
        $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
        $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
        
      copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
      if(!@is_link($vhost_conf_enabled_dir."/001-ispconfig.conf")) {
         exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/001-ispconfig.conf");
      }
		
   }
   
   public function configure_firewall()
@@ -966,8 +975,8 @@
      //* and create the symlink
      if($this->install_ispconfig_interface == true && $this->is_update == false) {
         if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
         if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
            exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
         if(!@is_link("$vhost_conf_enabled_dir/002-ispconfig.vhost")) {
            exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/002-ispconfig.vhost");
         }
      }
      
@@ -1033,9 +1042,12 @@
         if(stristr($val,'/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
      }
      
        // Crontab must end with an empty line or comment!
      $root_cron_jobs = array(
         '* * * * * /usr/local/ispconfig/server/server.sh > /dev/null',
         '30 00 * * * /usr/local/ispconfig/server/cron_daily.sh > /dev/null'
          '# --- ISPConfig ----',
         '* * * * * /usr/local/ispconfig/server/server.sh > /dev/null 2>> /var/log/var/log/ispconfig/cron.log',
         '30 00 * * * /usr/local/ispconfig/server/cron_daily.sh > /dev/null 2>> /var/log/var/log/ispconfig/cron.log',
          '# ------------------'
      );
      foreach($root_cron_jobs as $cron_job) {
         if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
@@ -1052,7 +1064,12 @@
         exec('crontab -u getmail -l > crontab.txt');
         $existing_cron_jobs = file('crontab.txt');
      
         $cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf > /dev/null');
            // Crontab must end with an empty line or comment!
         $cron_jobs = array(
              '# --- ISPConfig ----',
                '*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf > /dev/null 2>> /var/log/var/log/ispconfig/cron.log',
              '# ------------------'
            );
      
         // remove existing ispconfig cronjobs, in case the syntax has changed
         foreach($cron_jobs as $key => $val) {