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
---
server/conf/apache_ispconfig.conf.master | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 42d86ae..5fb0f2c 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
@@ -35,6 +41,24 @@
Allow from all
</Directory>
+# Allow access to mailman on OpenSuSE
+<Directory /usr/lib/mailman/cgi-bin>
+ AllowOverride All
+ order allow,deny
+ allow from all
+</Directory>
+
+<Directory /usr/lib/mailman/icons>
+ order allow,deny
+ allow from all
+</Directory>
+
+<Directory /var/lib/mailman/archives/>
+ Options +FollowSymLinks
+ order allow,deny
+ allow from all
+</Directory>
+
# allow path to awstats and alias for awstats icons
<Directory /usr/share/awstats>
Order allow,deny
@@ -43,8 +67,9 @@
Alias /awstats-icon "/usr/share/awstats/icon"
+NameVirtualHost *:80
+NameVirtualHost *:443
<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