From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/tpl/apache_ispconfig.conf.master | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index e8f311e..0745c28 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -5,7 +5,7 @@
################################################
LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" -d \"/etc/vlogger-dbi.conf\" /var/log/ispconfig/httpd" combined_ispconfig
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
<Directory /var/www/clients>
AllowOverride None
@@ -18,6 +18,12 @@
AllowOverride None
Order Deny,Allow
Deny from all
+</Directory>
+
+<Directory /var/www/conf>
+ AllowOverride None
+ Order Deny,Allow
+ Deny from all
</Directory>
# Except of the following directories that contain website scripts
@@ -41,6 +47,8 @@
Order allow,deny
Allow from all
</Directory>
+
Alias /awstats-icon "/usr/share/awstats/icon"
-
+NameVirtualHost *:80
+NameVirtualHost *:443
--
Gitblit v1.9.1