Skip to content

Commit db81c7c

Browse files
committed
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 parent 27037ac commit db81c7c

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

install/lib/installer_base.lib.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,15 @@ public function configure_apache()
699699
replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
700700
}
701701

702+
//* Copy the ISPConfig configuration include
703+
$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
704+
$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
705+
706+
copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
707+
if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
708+
exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
709+
}
710+
702711
}
703712

704713
public function configure_firewall()
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
3+
################################################
4+
# ISPConfig Logfile configuration for vlogger
5+
################################################
6+
7+
LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
8+
CustomLog "| /usr/sbin/vlogger -s access.log /var/log/ispconfig/httpd" combined_ispconfig
9+
10+

install/tpl/apache_ispconfig.vhost.master

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,4 @@ NameVirtualHost *:{vhost_port}
4040

4141
</VirtualHost>
4242

43-
###########################################
44-
# Logfile configuration for vlogger
45-
###########################################
46-
47-
LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
48-
CustomLog "| /usr/sbin/vlogger -s access.log /var/log/ispconfig/httpd" combined_ispconfig
49-
5043

0 commit comments

Comments
 (0)