X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-common%2Fdefault;h=9171a6cb6b7307c511e31c74767fe49749ccfa57;hb=0333f24bfc40dcb9fde9d364aa398831ae9d91db;hp=f6741590efeadce44b656a7325853aac5c7586f5;hpb=c13161fc80cf6409398ac7e527046aac09a3df32;p=sysconfig%2Fapache2.git

diff --git a/sites-common/default b/sites-common/default
index f674159..9171a6c 100644
--- a/sites-common/default
+++ b/sites-common/default
@@ -1,6 +1,6 @@
 ServerAdmin webmaster@dehnerts.com
 ServerName olinda.mit.edu
-ServerAlias svn.dehnerts.com svn.dehnert.arctic.org www.dehnerts.com www.dehnert.arctic.org
+ServerAlias www.dehnerts.com www.dehnert.arctic.org
 
 DocumentRoot /var/www/default
 <Directory />
@@ -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.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.log combined
 
 Alias /doc/ "/usr/share/doc/"
 <Directory "/usr/share/doc/">
@@ -39,5 +49,14 @@ 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
+Include ../mailman3/apache.conf