Fixes to work better on chankillo

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

diff --git a/sites-common/default b/sites-common/default
index 9171a6cb6b7307c511e31c74767fe49749ccfa57..7fbca5c66db93dcb4ec67486430ec2947a45a31b 100644 (file)
--- 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
 
-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/">
@@ -59,4 +59,16 @@ Alias /doc/ "/usr/share/doc/"
 </Directory>
 
 Include sites-common/awstats
-Include ../mailman3/apache.conf
+
+Alias /mailman3/static /opt/mailman/web/static
+<Directory "/opt/mailman/web/static/">
+       Require all granted
+</Directory>
+
+<IfModule mod_proxy_uwsgi.c>
+    ProxyPass /mailman3/favicon.ico !
+    ProxyPass /mailman3/static !
+    #ProxyPass /mailman3 unix:/run/mailman3-web/uwsgi.sock|uwsgi://localhost/
+    ProxyPass /mailman3 uwsgi://localhost:8080/
+    ProxyPassReverse /mailman3 uwsgi:/localhost:8080/
+</IfModule>