X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-common%2Fdefault;h=0450314534b7defcfad287f6223538606e85d480;hb=90f7ae0b47b5802b6cf38b8d713ed22586e9f10f;hp=19091912ef46bc0a123b67ba90ef1e888a42fa70;hpb=742b03b6b5997f0845bca3dd7b9543d419868977;p=sysconfig%2Fapache2.git
diff --git a/sites-common/default b/sites-common/default
index 1909191..0450314 100644
--- a/sites-common/default
+++ b/sites-common/default
@@ -2,14 +2,14 @@ ServerAdmin webmaster@dehnerts.com
ServerName olinda.mit.edu
ServerAlias svn.dehnerts.com svn.dehnert.arctic.org www.dehnerts.com www.dehnert.arctic.org
-DocumentRoot /var/www
+DocumentRoot /var/www/default
Options FollowSymLinks
AllowOverride None
Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ AllowOverride Limit Options FileInfo
Order allow,deny
allow from all
@@ -22,13 +22,23 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
Allow from all
-ErrorLog /var/log/apache2/error.olinda.log
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+Alias /roundcube /var/lib/roundcube
+
+ AuthUserFile /etc/apache2/htdigest
+ AuthGroupFile /etc/apache2/htgroups
+ AuthName "Secure"
+ AuthType Digest
+ Require group roundcube
+
+
+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/"
@@ -39,5 +49,14 @@ Alias /doc/ "/usr/share/doc/"
Allow from 127.0.0.0/255.0.0.0 ::1/128
-Include sites-common/awstats
+
+ AuthType Digest
+ AuthName "Private"
+ AuthDigestDomain "/clan/private/"
+ AuthDigestProvider file
+ AuthUserFile "/etc/apache2/htdigest"
+ Require user dehnertclan
+
+Include sites-common/awstats
+Include ../mailman3/apache.conf