From ea39b94c5f11f4e2255bce5bde5e6c8d2f1f0a59 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 27 Jul 2014 16:01:11 -0400
Subject: [PATCH] Fixed: FS#3463 - German: Translation of Proceted Folders user and inconsistency
---
server/conf/apache_ispconfig.conf.master | 79 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index a615198..6b2accb 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -3,108 +3,119 @@
# ISPConfig Logfile configuration for vlogger
################################################
-LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
+LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" 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
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
- Require all deny
- {tmpl_else}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ Require all denied
+ <tmpl_else>
Order Deny,Allow
Deny from all
- {/tmpl_if}
+ </tmpl_if>
</Directory>
# Do not allow access to the root file system of the server for security reasons
<Directory />
AllowOverride None
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
- Require all deny
- {tmpl_else}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ Require all denied
+ <tmpl_else>
Order Deny,Allow
Deny from all
- {/tmpl_if}
+ </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}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ Require all denied
+ <tmpl_else>
Order Deny,Allow
Deny from all
- {/tmpl_if}
+ </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'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </tmpl_if>
</Directory>
<Directory /usr/share/phpMyAdmin>
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </tmpl_if>
+</Directory>
+
+<Directory /srv/www/htdocs>
+ <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'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </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'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </tmpl_if>
</Directory>
<Directory /usr/lib/mailman/icons>
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </tmpl_if>
</Directory>
<Directory /var/lib/mailman/archives/>
Options +FollowSymLinks
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </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'}
+ <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- {tmpl_else}
+ <tmpl_else>
Order allow,deny
Allow from all
- {/tmpl_if}
+ </tmpl_if>
</Directory>
+<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
+</tmpl_if>
NameVirtualHost *:80
NameVirtualHost *:443
--
Gitblit v1.9.1