X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-common%2Fdefault;h=febad9afa3c4817acc2cd9b2be80218fa6778a40;hb=24a202bc90eb37a110fd524cee72308e8937efa9;hp=d7e619ae362dc8774efa554a9c87b03beb7b2508;hpb=cc88b712404442e61e0710d519a53a136b6def5e;p=sysconfig%2Fapache2.git

diff --git a/sites-common/default b/sites-common/default
index d7e619a..febad9a 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
 <Directory />
 	Options FollowSymLinks
 	AllowOverride None
 </Directory>
 <Directory /var/www/>
 	Options Indexes FollowSymLinks MultiViews
-	AllowOverride None
+	AllowOverride Limit Options FileInfo
 	Order allow,deny
 	allow from all
 </Directory>
@@ -22,13 +22,16 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	Allow from all
 </Directory>
 
-ErrorLog /var/log/apache2/error.log
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+Alias /roundcube /var/lib/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.log combined
+CustomLog ${APACHE_LOG_DIR}/access.olinda.log combined
 
 Alias /doc/ "/usr/share/doc/"
 <Directory "/usr/share/doc/">
@@ -40,4 +43,3 @@ Alias /doc/ "/usr/share/doc/"
 </Directory>
 
 Include sites-common/awstats
-