opendev/system-config
Code Issues Proposed changes

Merge "Improve logging and cache config for zuul web proxy"

Browse Source
This commit is contained in:
Zuul 2020-09-10 19:51:37 +00:00 committed by Gerrit Code Review
commit c3de2e8847
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/roles/zuul-web/templates/openstack.vhost.j2
View File

@ -1,3 +1,7 @@
{% raw %}
LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
{% endraw %}
<VirtualHost *:80> <VirtualHost *:80>
ServerName zuul.openstack.org ServerName zuul.openstack.org
ServerAdmin webmaster@openstack.org ServerAdmin webmaster@openstack.org
@ -6,7 +10,7 @@
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/zuul-access.log combined CustomLog ${APACHE_LOG_DIR}/zuul-access.log combined-cache
Redirect / https://zuul.openstack.org/ Redirect / https://zuul.openstack.org/
@ -23,7 +27,7 @@
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/zuul-ssl-access.log combined CustomLog ${APACHE_LOG_DIR}/zuul-ssl-access.log combined-cache
SSLEngine on SSLEngine on
SSLProtocol All -SSLv2 -SSLv3 SSLProtocol All -SSLv2 -SSLv3
@ -55,7 +59,7 @@
<IfModule mod_mem_cache.c> <IfModule mod_mem_cache.c>
# TODO: Should we cache the rest of the API too? # TODO: Should we cache the rest of the API too?
CacheEnable mem /api/status CacheEnable mem /api/status
CacheEnable mem /static/.* CacheEnable mem /static/
# 80MB max cache size. 10 objects at 8MB max each. # 80MB max cache size. 10 objects at 8MB max each.
MCacheSize 81920 MCacheSize 81920
MCacheMaxObjectCount 10 MCacheMaxObjectCount 10
@ -66,7 +70,7 @@
</IfModule> </IfModule>
<IfModule mod_cache_disk.c> <IfModule mod_cache_disk.c>
CacheEnable disk /api/status CacheEnable disk /api/status
CacheEnable disk /static/.* CacheEnable disk /static/
CacheRoot /var/cache/apache2/mod_cache_disk CacheRoot /var/cache/apache2/mod_cache_disk
CacheMaxFileSize 10000000 CacheMaxFileSize 10000000
</IfModule> </IfModule>

12
playbooks/roles/zuul-web/templates/zuul.vhost.j2
View File

@ -1,3 +1,7 @@
{% raw %}
LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
{% endraw %}
<VirtualHost *:80> <VirtualHost *:80>
ServerName zuul.opendev.org ServerName zuul.opendev.org
ServerAdmin webmaster@openstack.org ServerAdmin webmaster@openstack.org
@ -6,7 +10,7 @@
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/zuul-access.log combined CustomLog ${APACHE_LOG_DIR}/zuul-access.log combined-cache
Redirect / https://zuul.opendev.org/ Redirect / https://zuul.opendev.org/
@ -23,7 +27,7 @@
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/zuul-ssl-access.log combined CustomLog ${APACHE_LOG_DIR}/zuul-ssl-access.log combined-cache
SSLEngine on SSLEngine on
SSLProtocol All -SSLv2 -SSLv3 SSLProtocol All -SSLv2 -SSLv3
@ -53,7 +57,7 @@
<IfModule mod_mem_cache.c> <IfModule mod_mem_cache.c>
# TODO: Should we cache the rest of the API too? # TODO: Should we cache the rest of the API too?
CacheEnable mem /api/tenant/.*/status CacheEnable mem /api/tenant/.*/status
CacheEnable mem /static/.* CacheEnable mem /static/
# 80MB max cache size. 10 objects at 8MB max each. # 80MB max cache size. 10 objects at 8MB max each.
MCacheSize 81920 MCacheSize 81920
MCacheMaxObjectCount 10 MCacheMaxObjectCount 10
@ -64,7 +68,7 @@
</IfModule> </IfModule>
<IfModule mod_cache_disk.c> <IfModule mod_cache_disk.c>
CacheEnable disk /api/tenant/.*/status CacheEnable disk /api/tenant/.*/status
CacheEnable disk /static/.* CacheEnable disk /static/
CacheRoot /var/cache/apache2/mod_cache_disk CacheRoot /var/cache/apache2/mod_cache_disk
CacheMaxFileSize 10000000 CacheMaxFileSize 10000000
</IfModule> </IfModule>