diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 2a6cca091c5e314f68a1d18af7f4ea673433ba1e..a62e1d965356a1f326b042669c0522c0d7f1d778 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -699,6 +699,15 @@ class installer_base { 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() diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master new file mode 100644 index 0000000000000000000000000000000000000000..5565606953b430348cf8995038f0da68418f0881 --- /dev/null +++ b/install/tpl/apache_ispconfig.conf.master @@ -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 + + diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master index d53dbad3f627ea017b5161a03b13b68d5182bbf7..e9bfee5a388124f22c653966a9a9b80b33976851 100644 --- a/install/tpl/apache_ispconfig.vhost.master +++ b/install/tpl/apache_ispconfig.vhost.master @@ -40,11 +40,4 @@ NameVirtualHost *:{vhost_port} </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 -