summaryrefslogtreecommitdiff
path: root/moin
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2020-10-11 21:08:58 +0200
committerJonas Smedegaard <dr@jones.dk>2020-10-11 21:08:58 +0200
commitba4e3d3b24bacc22a5e86e7b33df40775d77d7d4 (patch)
tree57f3b63a9aa27b833780cb5b61a3fb00ebf4c0d6 /moin
parent522e8d71cc89e670cb33d3b3bdb311d478397860 (diff)
drop apache2 snippet local-log-origin, and streamline log options for sample vhosts
Diffstat (limited to 'moin')
-rw-r--r--moin/apache2/sites-available/wiki.secure-example.com.conf7
1 files changed, 2 insertions, 5 deletions
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>