X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-common%2Fdefault;h=8d6b8c32f090411fd612329a4d051c4c0f983ed6;hb=57cdeaebc3075b3e1d7c5863e239dcdb3b459572;hp=9171a6cb6b7307c511e31c74767fe49749ccfa57;hpb=0333f24bfc40dcb9fde9d364aa398831ae9d91db;p=sysconfig%2Fapache2.git

diff --git a/sites-common/default b/sites-common/default
index 9171a6c..8d6b8c3 100644
--- a/sites-common/default
+++ b/sites-common/default
@@ -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
@@ -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>