opendev/system-config
Code Issues Proposed changes

mirror: rename 80/443 log files

Browse Source 
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
This commit is contained in:
Ian Wienand 2019-05-29 14:21:36 +10:00
parent afc8e507af
commit 42e54e2c08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/roles/mirror/templates/mirror.vhost.j2
View File

@ -13,7 +13,7 @@ NameVirtualHost *:8082
LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache 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 DocumentRoot /var/www/mirror
<Directory /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 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d
RewriteRule (.*)-(.*) $1.$2 [N] RewriteRule (.*)-(.*) $1.$2 [N]
ErrorLog /var/log/apache2/proxy_$port_error.log ErrorLog /var/log/apache2/mirror_$port_error.log
LogLevel warn LogLevel warn
CustomLog /var/log/apache2/proxy_$port_access.log combined-cache CustomLog /var/log/apache2/mirror_$port_access.log combined-cache
ServerSignature Off ServerSignature Off
</Macro> </Macro>
@ -112,7 +112,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a
ServerName {{ apache_server_name }} ServerName {{ apache_server_name }}
ServerAlias {{ apache_server_alias }} ServerAlias {{ apache_server_alias }}
Use BaseProxy 80 Use BaseMirror 80
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <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 SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
SSLHonorCipherOrder on SSLHonorCipherOrder on
Use BaseProxy 443 Use BaseMirror 443
</VirtualHost> </VirtualHost>
<VirtualHost *:8080> <VirtualHost *:8080>