diff --git a/server/conf/apache_apps.vhost.master b/server/conf/apache_apps.vhost.master
index 49f829a6d4465c2fe4a56d8b3f8317925a014ed1..99665df0d64ef43309f7d4ac6ce99b22f57a8ab4 100644
--- a/server/conf/apache_apps.vhost.master
+++ b/server/conf/apache_apps.vhost.master
@@ -21,12 +21,12 @@
Options FollowSymLinks
AllowOverride None
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
@@ -38,12 +38,12 @@
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index a6151988071b2ab5f52ef9d435d89391cd7ed1ce..f9062f549da65c17c5447b36986dd9f6af26913e 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -8,100 +8,100 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
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}
+
# Do not allow access to the root file system of the server for security reasons
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}
+
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}
+
# Except of the following directories that contain website scripts
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
# Allow access to mailman on OpenSuSE
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
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}
+
# allow path to awstats and alias for awstats 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}
+
Alias /awstats-icon "/usr/share/awstats/icon"
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 0f8a79ad6104ef3126d329f738225004cfd21266..035f3a52a6fbd3bb44f91d76f0e11c80b6c34d58 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -1,12 +1,12 @@
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}
+
@@ -59,12 +59,12 @@
Options FollowSymLinks
AllowOverride
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
# ssi enabled
@@ -74,25 +74,25 @@
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all denied
- {tmpl_else}
+
Order allow,deny
Deny from all
Allow from none
- {/tmpl_if}
+
Options FollowSymLinks
AllowOverride
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
# ssi enabled
@@ -102,13 +102,13 @@
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all denied
- {tmpl_else}
+
Order allow,deny
Deny from all
Allow from none
- {/tmpl_if}
+
@@ -161,12 +161,12 @@
# cgi enabled
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
ScriptAlias /cgi-bin/ /cgi-bin/
AddHandler cgi-script .cgi
@@ -213,12 +213,12 @@
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
@@ -252,35 +252,35 @@
FCGIWrapper .php
Options +ExecCGI
AllowOverride
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
AddHandler fcgid-script .php .php3 .php4 .php5
FCGIWrapper .php
Options +ExecCGI
AllowOverride
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
- {tmpl_if name='apache_version' op='>' value='2.2' format='version'}
+
Require all granted
- {tmpl_else}
+
Order allow,deny
Allow from all
- {/tmpl_if}
+
AddHandler php5-fcgi .php
Action php5-fcgi /php5-fcgi