Fixed: FS#1388 - Namevirtualhost directive is missing after update. 2nd try ;)

tbrehm

2010-10-26 9fcf88d06d20076f1b228979e9ed4e8a56f39ef8

Fixed: FS#1388 - Namevirtualhost directive is missing after update. 2nd try ;)

 install/lib/installer_base.lib.php

@@ -1004,7 +1004,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";

 install/tpl/apache_ispconfig.conf.master

@@ -44,9 +44,3 @@

Alias /awstats-icon "/usr/share/awstats/icon"

<tmpl_loop name="ip_adresses">
NameVirtualHost {tmpl_var name="ip_address"}:80
NameVirtualHost {tmpl_var name="ip_address"}:443
</tmpl_loop>