Merged revisions 2095-2129 which contain bugfixes from stable branch.

tbrehm

2010-11-24 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af

 install/lib/installer_base.lib.php

@@ -1010,7 +1010,7 @@
      // copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');

      $content = rf('tpl/apache_ispconfig.conf.master');
      $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
      $records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
      if(is_array($records) && count($records) > 0) {
         foreach($records as $rec) {
            $content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
@@ -1036,6 +1036,10 @@
         replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental     yes',0,0);
         replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName     webalizer.hist',0,0);
      }
		
      // Check the awsatst script
      if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
      if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');

      //* add a sshusers group
      $command = 'groupadd sshusers';