Merged revisions 3028-3045 from stable branch.

tbrehm

2012-04-12 02bf997271f4d09e91c8fcb9cecd08f06f2400c4

 install/tpl/apache_ispconfig.conf.master

@@ -20,8 +20,19 @@
       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
<Directory /usr/share/phpmyadmin>
        Order allow,deny
        Allow from all
</Directory>

<Directory /usr/share/phpMyAdmin>
        Order allow,deny
        Allow from all
</Directory>
@@ -31,4 +42,11 @@
        Allow from all
</Directory>

# allow path to awstats and alias for awstats icons
<Directory /usr/share/awstats>
        Order allow,deny
        Allow from all
</Directory>

Alias /awstats-icon "/usr/share/awstats/icon"