projects
/
sysconfig
/
apache2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying up as we move away from olinda
[sysconfig/apache2.git]
/
sites-common
/
default
diff --git
a/sites-common/default
b/sites-common/default
index febad9afa3c4817acc2cd9b2be80218fa6778a40..9171a6cb6b7307c511e31c74767fe49749ccfa57 100644
(file)
--- a/
sites-common/default
+++ b/
sites-common/default
@@
-1,6
+1,6
@@
ServerAdmin webmaster@dehnerts.com
ServerName olinda.mit.edu
ServerAdmin webmaster@dehnerts.com
ServerName olinda.mit.edu
-ServerAlias
svn.dehnerts.com svn.dehnert.arctic.org
www.dehnerts.com www.dehnert.arctic.org
+ServerAlias www.dehnerts.com www.dehnert.arctic.org
DocumentRoot /var/www/default
<Directory />
DocumentRoot /var/www/default
<Directory />
@@
-24,14
+24,21
@@
ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
Alias /roundcube /var/lib/roundcube
Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
Alias /roundcube /var/lib/roundcube
+<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.
olinda.
log
+ErrorLog ${APACHE_LOG_DIR}/error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
-CustomLog ${APACHE_LOG_DIR}/access.
olinda.
log combined
+CustomLog ${APACHE_LOG_DIR}/access.log combined
Alias /doc/ "/usr/share/doc/"
<Directory "/usr/share/doc/">
Alias /doc/ "/usr/share/doc/"
<Directory "/usr/share/doc/">
@@
-42,4
+49,14
@@
Alias /doc/ "/usr/share/doc/"
Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory>
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
Include sites-common/awstats
+Include ../mailman3/apache.conf