paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Include Zulip version and external host in camo User-Agent.

Browse Source
This commit is contained in:
Alex Vandiver
2025-10-17 15:03:21 +00:00
committed by Tim Abbott
parent 5319b767a1
commit c17564ac27
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/camo.pp
View File

@@ -35,6 +35,8 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
$proxy = '' $proxy = ''
} }
$zulip_version = $facts['zulip_version']
$external_uri = pick(get_django_setting_slow('ROOT_DOMAIN_URI'), 'https://zulip.com')
file { "${zulip::common::supervisor_conf_dir}/go-camo.conf": file { "${zulip::common::supervisor_conf_dir}/go-camo.conf":
ensure => file, ensure => file,
require => [ require => [

2
puppet/zulip/templates/supervisor/go-camo.conf.erb
View File

@@ -1,5 +1,5 @@
[program:go-camo] [program:go-camo]
command=/usr/local/bin/secret-env-wrapper GOCAMO_HMAC=camo_key <%= @bin %> --listen=<%= @listen_address %>:9292 -H "Strict-Transport-Security: max-age=15768000" -H "X-Frame-Options: DENY" --metrics --verbose --allow-content-video command=/usr/local/bin/secret-env-wrapper GOCAMO_HMAC=camo_key <%= @bin %> --listen=<%= @listen_address %>:9292 -H "Strict-Transport-Security: max-age=15768000" -H "X-Frame-Options: DENY" --metrics --verbose --allow-content-video --user-agent "Zulip-Server/<%= @zulip_version %> (<%= @external_uri %>/) go-camo/<%= @version %>" --server-name "go-camo/<%= @version %>"
environment=HTTP_PROXY="<%= @proxy %>",HTTPS_PROXY="<%= @proxy %>" environment=HTTP_PROXY="<%= @proxy %>",HTTPS_PROXY="<%= @proxy %>"
priority=15 priority=15
autostart=true autostart=true