diff options
Diffstat (limited to 'apache2/sites-available/wiki.secure-example.com')
| -rw-r--r-- | apache2/sites-available/wiki.secure-example.com | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com index 04cf7e0..8ca2919 100644 --- a/apache2/sites-available/wiki.secure-example.com +++ b/apache2/sites-available/wiki.secure-example.com @@ -1,7 +1,8 @@ <VirtualHost *:443> - ServerName wiki.example.com - ServerAdmin webmaster@example.com - DocumentRoot /usr/share/moin/htdocs + ServerName wiki.example.com + ServerAdmin webmaster@example.com + + DocumentRoot /usr/share/moin/htdocs Include /etc/apache2/conf.d/local-ssl.conf @@ -29,9 +30,7 @@ AcceptPathInfo On RewriteEngine On - RewriteLogLevel 1 - RewriteRule ^/moin(/(.*))? /$2 [last,R] RewriteRule ^/wiki/ - [last] RewriteRule ^/robots.txt - [last] @@ -42,9 +41,8 @@ # RewriteRule ^/?(.*) /var/local/moin/server/moinmodpy.py$1 [last] # RewriteRule ^/?(.*) moin/$1 [last,type=application/x-python-code] - Include /etc/apache2/conf.d/local-log-vhosts.conf - CustomLog "| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger - ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" + ErrorLog /var/log/apache2/wiki.example.com-error.log + CustomLog /var/log/apache2/wiki.example.com-access.log combined </VirtualHost> <VirtualHost *:443> ServerName www.wiki.example.com:443 @@ -53,12 +51,13 @@ ServerAdmin webmaster@example.com Include /etc/apache2/conf.d/local-ssl.conf + Include /etc/apache2/conf.d/local-log-origin.conf RewriteEngine On # RewriteRule / https://wiki.example.com/ [R] RewriteRule /(.*)? https://wiki.example.com/$1 [R] - TransferLog /dev/null + CustomLog /var/log/apache2/redirect.log origin </VirtualHost> <VirtualHost *:80> ServerName wiki.example.com @@ -67,9 +66,11 @@ ServerAlias *.wiki ServerAdmin webmaster@example.com + Include /etc/apache2/conf.d/local-log-origin.conf + RewriteEngine On # RewriteRule / https://wiki.example.com/ [R] RewriteRule /(.*)? https://wiki.example.com/$1 [R] - TransferLog /dev/null + CustomLog /var/log/apache2/redirect.log origin </VirtualHost> |