projects
/
sysconfig
/
apache2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send full cert chain
[sysconfig/apache2.git]
/
sites-common
/
default
diff --git
a/sites-common/default
b/sites-common/default
index 19091912ef46bc0a123b67ba90ef1e888a42fa70..febad9afa3c4817acc2cd9b2be80218fa6778a40 100644
(file)
--- a/
sites-common/default
+++ b/
sites-common/default
@@
-2,14
+2,14
@@
ServerAdmin webmaster@dehnerts.com
ServerName olinda.mit.edu
ServerAlias svn.dehnerts.com svn.dehnert.arctic.org www.dehnerts.com www.dehnert.arctic.org
ServerName olinda.mit.edu
ServerAlias svn.dehnerts.com svn.dehnert.arctic.org www.dehnerts.com www.dehnert.arctic.org
-DocumentRoot /var/www
+DocumentRoot /var/www
/default
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
<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>
Order allow,deny
allow from all
</Directory>
@@
-22,13
+22,16
@@
ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
Allow from all
</Directory>
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
+
+ErrorLog ${APACHE_LOG_DIR}/error.olinda.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
/var/log/apache2
/access.olinda.log combined
+CustomLog
${APACHE_LOG_DIR}
/access.olinda.log combined
Alias /doc/ "/usr/share/doc/"
<Directory "/usr/share/doc/">
Alias /doc/ "/usr/share/doc/"
<Directory "/usr/share/doc/">
@@
-40,4
+43,3
@@
Alias /doc/ "/usr/share/doc/"
</Directory>
Include sites-common/awstats
</Directory>
Include sites-common/awstats
-