From 42e54e2c08743ae692fea930c8eee028c1f19c93 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 29 May 2019 14:21:36 +1000
Subject: [PATCH] mirror: rename 80/443 log files
Having proxy_[80|443]_access.log is wrong beacuse they're not really
proxies (I think I just copied this incorrectly). Change it to
mirror_, and update the macro that is only used on the mirror portions
too.
Change-Id: I8eca941fee9606d25dd25bc54bc552ccc7094e0f
---
playbooks/roles/mirror/templates/mirror.vhost.j2 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/playbooks/roles/mirror/templates/mirror.vhost.j2 b/playbooks/roles/mirror/templates/mirror.vhost.j2
index 68ce814309..97cbadeb07 100644
--- a/playbooks/roles/mirror/templates/mirror.vhost.j2
+++ b/playbooks/roles/mirror/templates/mirror.vhost.j2
@@ -13,7 +13,7 @@ NameVirtualHost *:8082
LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
-<Macro BaseProxy $port>
+<Macro BaseMirror $port>
DocumentRoot /var/www/mirror
<Directory /var/www/mirror>
@@ -101,9 +101,9 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d
RewriteRule (.*)-(.*) $1.$2 [N]
- ErrorLog /var/log/apache2/proxy_$port_error.log
+ ErrorLog /var/log/apache2/mirror_$port_error.log
LogLevel warn
- CustomLog /var/log/apache2/proxy_$port_access.log combined-cache
+ CustomLog /var/log/apache2/mirror_$port_access.log combined-cache
ServerSignature Off
</Macro>
@@ -112,7 +112,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
ServerName {{ apache_server_name }}
ServerAlias {{ apache_server_alias }}
- Use BaseProxy 80
+ Use BaseMirror 80
</VirtualHost>
<VirtualHost *:443>
@@ -127,7 +127,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
SSLHonorCipherOrder on
- Use BaseProxy 443
+ Use BaseMirror 443
</VirtualHost>
<VirtualHost *:8080>