tbrehm
2008-12-21 db81c7c7254c67c35d029557b560dad38c9db514
Put vlogger log directives in separate apache config file so they are available for the websites even if the controlpanel is not installed on the server.
1 files added
2 files modified
26 ■■■■ changed files
install/lib/installer_base.lib.php 9 ●●●●● patch | view | raw | blame | history
install/tpl/apache_ispconfig.conf.master 10 ●●●●● patch | view | raw | blame | history
install/tpl/apache_ispconfig.vhost.master 7 ●●●●● patch | view | raw | blame | history
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."/000-ispconfig.conf")) {
            exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
        }
    }
    
    public function configure_firewall()
install/tpl/apache_ispconfig.conf.master
New file
@@ -0,0 +1,10 @@
################################################
# 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 /var/log/ispconfig/httpd" combined_ispconfig
install/tpl/apache_ispconfig.vhost.master
@@ -40,11 +40,4 @@
</VirtualHost>
###########################################
# 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 /var/log/ispconfig/httpd" combined_ispconfig