From cab7ea5faaa2f3510c8488e7d19d083fc05ac6ca Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 18 Sep 2013 04:17:27 -0400
Subject: [PATCH] - Fixed missing global $app in new _decode function

---
 install/tpl/apache_ispconfig.conf.master |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 4d29612..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
@@ -20,8 +20,19 @@
        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
 <Directory /usr/share/phpmyadmin>
+        Order allow,deny
+        Allow from all
+</Directory>
+
+<Directory /usr/share/phpMyAdmin>
         Order allow,deny
         Allow from all
 </Directory>
@@ -31,4 +42,13 @@
         Allow from all
 </Directory>
 
+# allow path to awstats and alias for awstats icons
+<Directory /usr/share/awstats>
+        Order allow,deny
+        Allow from all
+</Directory>
 
+Alias /awstats-icon "/usr/share/awstats/icon"
+
+NameVirtualHost *:80
+NameVirtualHost *:443

--
Gitblit v1.9.1