X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-common%2Fdefault;h=9a46a8a56eaf944a8db3bac55a30fd22a6eb3083;hb=ecf63c258eb2736fec128303a72a157b3acb3bce;hp=c2197afe36c1676195a451c851f8200230fa1b5e;hpb=df9a3d3962e755292da705750641f1155fe76624;p=sysconfig%2Fapache2.git

diff --git a/sites-common/default b/sites-common/default
index c2197af..9a46a8a 100644
--- a/sites-common/default
+++ b/sites-common/default
@@ -1,8 +1,8 @@
 ServerAdmin webmaster@dehnerts.com
-ServerName olinda.mit.edu
-ServerAlias www.dehnerts.com www.dehnert.arctic.org
+ServerName chankillo.dehnerts.com
+ServerAlias chankillo.mit.edu dehnerts.com www.dehnerts.com www.dehnert.arctic.org git.dehnerts.com
 
-DocumentRoot /var/www/default
+DocumentRoot /var/www/html/
 <Directory />
 	Options FollowSymLinks
 	AllowOverride None
@@ -23,7 +23,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 </Directory>
 
 Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
-Alias /roundcube /var/lib/roundcube
+Alias /roundcube /var/lib/roundcube/public_html
 <Directory "/var/lib/roundcube">
 	AuthUserFile  /etc/apache2/htdigest
 	AuthGroupFile /etc/apache2/htgroups
@@ -38,7 +38,7 @@ ErrorLog ${APACHE_LOG_DIR}/error.log
 # alert, emerg.
 LogLevel warn
 
-CustomLog ${APACHE_LOG_DIR}/access.log combined
+CustomLog ${APACHE_LOG_DIR}/access.log vhost_combined
 
 Alias /doc/ "/usr/share/doc/"
 <Directory "/usr/share/doc/">