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 47bfc1d5c3ebaeba1d4d4f71220404cd7ea2c3ac..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 />
@@
-32,13
+32,13
@@
Alias /roundcube /var/lib/roundcube
Require group roundcube
</Directory>
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/">
@@
-59,3
+59,4
@@
Alias /doc/ "/usr/share/doc/"
</Directory>
Include sites-common/awstats
</Directory>
Include sites-common/awstats
+Include ../mailman3/apache.conf