From ba4e3d3b24bacc22a5e86e7b33df40775d77d7d4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 11 Oct 2020 21:08:58 +0200
Subject: drop apache2 snippet local-log-origin, and streamline log options for
sample vhosts
---
moin/apache2/sites-available/wiki.secure-example.com.conf | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'moin')
diff --git a/moin/apache2/sites-available/wiki.secure-example.com.conf b/moin/apache2/sites-available/wiki.secure-example.com.conf
index 5ccca1b..d369624 100644
--- a/moin/apache2/sites-available/wiki.secure-example.com.conf
+++ b/moin/apache2/sites-available/wiki.secure-example.com.conf
@@ -19,13 +19,12 @@
ServerName *.wiki:443
Include conf.d/local-ssl.conf
- Include conf.d/local-log-origin.conf
RewriteEngine On
RewriteRule / https://wiki.example.com/ [R]
# RewriteRule /(.*)? https://wiki.example.com/$1 [R]
- CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+ CustomLog ${APACHE_LOG_DIR}/redirect.log vhost_combined
</VirtualHost>
<VirtualHost *:80>
ServerName wiki.example.com
@@ -33,11 +32,9 @@
ServerAlias wiki
ServerAlias *.wiki
- Include conf.d/local-log-origin.conf
-
RewriteEngine On
RewriteRule / https://wiki.example.com/ [R]
# RewriteRule /(.*)? https://wiki.example.com/$1 [R]
- CustomLog ${APACHE_LOG_DIR}/redirect.log origin
+ CustomLog ${APACHE_LOG_DIR}/redirect.log vhost_combined
</VirtualHost>
--
cgit v1.2.3