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

diff --git a/sites-common/default b/sites-common/default
index 1909191..9a46a8a 100644
--- a/sites-common/default
+++ b/sites-common/default
@@ -1,15 +1,15 @@
 ServerAdmin webmaster@dehnerts.com
-ServerName olinda.mit.edu
-ServerAlias svn.dehnerts.com svn.dehnert.arctic.org 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
+DocumentRoot /var/www/html/
 <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,23 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	Allow from all
 </Directory>
 
-ErrorLog /var/log/apache2/error.olinda.log
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+Alias /roundcube /var/lib/roundcube/public_html
+<Directory "/var/lib/roundcube">
+	AuthUserFile  /etc/apache2/htdigest
+	AuthGroupFile /etc/apache2/htgroups
+	AuthName "Secure"
+	AuthType Digest
+	Require group roundcube
+</Directory>
+
+ErrorLog ${APACHE_LOG_DIR}/error.log
 
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
 LogLevel warn
 
-CustomLog /var/log/apache2/access.olinda.log combined
+CustomLog ${APACHE_LOG_DIR}/access.log vhost_combined
 
 Alias /doc/ "/usr/share/doc/"
 <Directory "/usr/share/doc/">
@@ -39,5 +49,26 @@ Alias /doc/ "/usr/share/doc/"
 	Allow from 127.0.0.0/255.0.0.0 ::1/128
 </Directory>
 
+<Directory "/var/www/default/clan/private">
+    AuthType Digest
+    AuthName "Private"
+    AuthDigestDomain "/clan/private/"
+    AuthDigestProvider file
+    AuthUserFile "/etc/apache2/htdigest"
+    Require user dehnertclan
+</Directory>
+
 Include sites-common/awstats
 
+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>