X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;ds=inline;f=sites-common%2Fdefault;h=7fbca5c66db93dcb4ec67486430ec2947a45a31b;hb=0937ce6e8370a6c93af71098bf4a360ab6824944;hp=9171a6cb6b7307c511e31c74767fe49749ccfa57;hpb=0333f24bfc40dcb9fde9d364aa398831ae9d91db;p=sysconfig%2Fapache2.git
diff --git a/sites-common/default b/sites-common/default
index 9171a6c..7fbca5c 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
-DocumentRoot /var/www/default
+DocumentRoot /var/www/html/
Options FollowSymLinks
AllowOverride None
@@ -23,7 +23,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
-Alias /roundcube /var/lib/roundcube
+Alias /roundcube /var/lib/roundcube/public_html
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/"
@@ -59,4 +59,16 @@ Alias /doc/ "/usr/share/doc/"
Include sites-common/awstats
-Include ../mailman3/apache.conf
+
+Alias /mailman3/static /opt/mailman/web/static
+
+ Require all granted
+
+
+
+ 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/
+