X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;ds=inline;f=sites-common%2Fdefault;h=7fbca5c66db93dcb4ec67486430ec2947a45a31b;hb=0937ce6e8370a6c93af71098bf4a360ab6824944;hp=f6741590efeadce44b656a7325853aac5c7586f5;hpb=c13161fc80cf6409398ac7e527046aac09a3df32;p=sysconfig%2Fapache2.git
diff --git a/sites-common/default b/sites-common/default
index f674159..7fbca5c 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
-DocumentRoot /var/www/default
+DocumentRoot /var/www/html/
Options FollowSymLinks
AllowOverride None
Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ AllowOverride Limit Options FileInfo
Order allow,deny
allow from all
@@ -22,13 +22,23 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
Allow from all
-ErrorLog /var/log/apache2/error.olinda.log
+Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+Alias /roundcube /var/lib/roundcube/public_html
+
+ AuthUserFile /etc/apache2/htdigest
+ AuthGroupFile /etc/apache2/htgroups
+ AuthName "Secure"
+ AuthType Digest
+ Require group roundcube
+
+
+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/"
@@ -39,5 +49,26 @@ Alias /doc/ "/usr/share/doc/"
Allow from 127.0.0.0/255.0.0.0 ::1/128
+
+ AuthType Digest
+ AuthName "Private"
+ AuthDigestDomain "/clan/private/"
+ AuthDigestProvider file
+ AuthUserFile "/etc/apache2/htdigest"
+ Require user dehnertclan
+
+
Include sites-common/awstats
+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/
+