mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	puppet: Include Zulip version and external host in camo User-Agent.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							5319b767a1
						
					
				
				
					commit
					c17564ac27
				
			@@ -35,6 +35,8 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
 | 
			
		||||
    $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":
 | 
			
		||||
    ensure  => file,
 | 
			
		||||
    require => [
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
[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 %>"
 | 
			
		||||
priority=15
 | 
			
		||||
autostart=true
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user