From 117ecd60c809bbc19a3c1f795f6db9e53465cdec Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 19 Jun 2014 07:00:44 -0400
Subject: [PATCH] - autoselect password if you use "Generate Password" function (saves a click if you want to copy the password).
---
server/conf/apache_ispconfig.conf.master | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index a615198..be6f637 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -8,103 +8,114 @@
<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