tbrehm
2009-02-14 0ea264c1144f00fb5a377a3a4223dfa0f7f597f8
ISPConfig writes namevirtualhost directives.
1 files deleted
1 files modified
1 files added
36 ■■■■ changed files
server/conf/apache.conf.master 3 ●●●●● patch | view | raw | blame | history
server/conf/apache_ispconfig.conf.master 12 ●●●●● patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 21 ●●●● patch | view | raw | blame | history
server/conf/apache.conf.master
File was deleted
server/conf/apache_ispconfig.conf.master
New file
@@ -0,0 +1,12 @@
################################################
# ISPConfig Logfile configuration for vlogger
################################################
LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
CustomLog "| /usr/sbin/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
<tmpl_loop name="ip_adresses">
NameVirtualHost {tmpl_var name="ip_address"}:80
NameVirtualHost {tmpl_var name="ip_address"}:443
</tmpl_loop>
server/plugins-available/apache2_plugin.inc.php
@@ -721,9 +721,24 @@
    function server_ip($event_name,$data) {
        global $app, $conf;
        
        // Here we write the name virtualhost directives
        // NameVirtualHost IP:80
        // NameVirtualHost IP:443
        // load the server configuration options
        $app->uses("getconf");
        $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
        $app->load('tpl');
        $tpl = new tpl();
        $tpl->newTemplate("apache_ispconfig.conf.master");
        $records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
        if(count($records) > 0) {
            $tpl->setLoop('ip_adresses',$records);
        }
        $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/ispconfig.conf');
        file_put_contents($vhost_file,$tpl->grab());
        $app->log("Writing the conf file: ispconfig.conf",LOGLEVEL_DEBUG);
        unset($tpl);
        
    }