proxy: Fix exception for serving locally

[sysconfig/apache2.git] / sites-common / default

diff --git a/sites-common/default b/sites-common/default
index f6741590efeadce44b656a7325853aac5c7586f5..47bfc1d5c3ebaeba1d4d4f71220404cd7ea2c3ac 100644 (file)
--- a/sites-common/default
+++ b/sites-common/default
@@ -9,7 +9,7 @@ DocumentRoot /var/www/default
 </Directory>
 <Directory /var/www/>
        Options Indexes FollowSymLinks MultiViews
-       AllowOverride None
+       AllowOverride Limit Options FileInfo
        Order allow,deny
        allow from all
 </Directory>
@@ -22,13 +22,23 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
        Allow from all
 </Directory>
 
-ErrorLog /var/log/apache2/error.olinda.log
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+Alias /roundcube /var/lib/roundcube
+<Directory "/var/lib/roundcube">
+       AuthUserFile  /etc/apache2/htdigest
+       AuthGroupFile /etc/apache2/htgroups
+       AuthName "Secure"
+       AuthType Digest
+       Require group roundcube
+</Directory>
+
+ErrorLog ${APACHE_LOG_DIR}/error.olinda.log
 
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
 LogLevel warn
 
-CustomLog /var/log/apache2/access.olinda.log combined
+CustomLog ${APACHE_LOG_DIR}/access.olinda.log combined
 
 Alias /doc/ "/usr/share/doc/"
 <Directory "/usr/share/doc/">
@@ -39,5 +49,13 @@ Alias /doc/ "/usr/share/doc/"
        Allow from 127.0.0.0/255.0.0.0 ::1/128
 </Directory>
 
-Include sites-common/awstats
+<Directory "/var/www/default/clan/private">
+    AuthType Digest
+    AuthName "Private"
+    AuthDigestDomain "/clan/private/"
+    AuthDigestProvider file
+    AuthUserFile "/etc/apache2/htdigest"
+    Require user dehnertclan
+</Directory>
 
+Include sites-common/awstats