From 481c00a06333c7e4759d0fbd780a9adccbfa00c3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 20 Jun 2012 04:22:11 -0400
Subject: [PATCH] Implemented: FS#1434 - Extend vhost config rollback to ssl certificates
---
server/conf/apache_ispconfig.conf.master | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 752c8bf..b6ac8c3 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -4,7 +4,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
@@ -14,9 +14,15 @@
# Do not allow access to the root file system of the server for security reasons
<Directory />
- AllowOverride None
- Order Deny,Allow
- Deny from all
+ 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
@@ -40,10 +46,10 @@
Order allow,deny
Allow from all
</Directory>
+
Alias /awstats-icon "/usr/share/awstats/icon"
<tmpl_loop name="ip_adresses">
-NameVirtualHost {tmpl_var name="ip_address"}:80
-NameVirtualHost {tmpl_var name="ip_address"}:443
+NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
</tmpl_loop>
--
Gitblit v1.9.1