From d6aadf81f11cbb3cda030d095feb6e8c8a44aafe Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 04:36:33 -0500
Subject: [PATCH] Fixed: tpl class now accepts 4 parameters instead of 3 in tags
---
server/conf/apache_ispconfig.conf.master | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 7439208..a615198 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -4,35 +4,111 @@
################################################
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
- Order Deny,Allow
- Deny from all
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all deny
+ {tmpl_else}
+ Order Deny,Allow
+ Deny from all
+ {/tmpl_if}
</Directory>
# 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
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all deny
+ {tmpl_else}
+ Order Deny,Allow
+ Deny from all
+ {/tmpl_if}
+</Directory>
+
+<Directory /var/www/conf>
+ AllowOverride None
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all deny
+ {tmpl_else}
+ Order Deny,Allow
+ Deny from all
+ {/tmpl_if}
</Directory>
# Except of the following directories that contain website scripts
<Directory /usr/share/phpmyadmin>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
Order allow,deny
Allow from all
+ {/tmpl_if}
+</Directory>
+
+<Directory /usr/share/phpMyAdmin>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
+ Order allow,deny
+ Allow from all
+ {/tmpl_if}
</Directory>
<Directory /usr/share/squirrelmail>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
Order allow,deny
Allow from all
+ {/tmpl_if}
</Directory>
+# Allow access to mailman on OpenSuSE
+<Directory /usr/lib/mailman/cgi-bin>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
+ Order allow,deny
+ Allow from all
+ {/tmpl_if}
+</Directory>
+<Directory /usr/lib/mailman/icons>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
+ Order allow,deny
+ Allow from all
+ {/tmpl_if}
+</Directory>
+
+<Directory /var/lib/mailman/archives/>
+ Options +FollowSymLinks
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
+ Order allow,deny
+ Allow from all
+ {/tmpl_if}
+</Directory>
+
+# allow path to awstats and alias for awstats icons
+<Directory /usr/share/awstats>
+ {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ Require all granted
+ {tmpl_else}
+ Order allow,deny
+ Allow from all
+ {/tmpl_if}
+</Directory>
+
+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