From 5e7d61464d552597f83ba6e2eb70d189009923bf Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 29 May 2023 15:13:42 -0700 Subject: [PATCH] puppet: Include trusted-proto definition in zulip_ops configurations. This should have been part of 0935d388f05337e73898d932ddb75b458cf4747e. --- puppet/zulip_ops/files/nginx/sites-available/zulip | 1 + puppet/zulip_ops/files/nginx/sites-available/zulip-staging | 1 + 2 files changed, 2 insertions(+) diff --git a/puppet/zulip_ops/files/nginx/sites-available/zulip b/puppet/zulip_ops/files/nginx/sites-available/zulip index ddc2aaf9b5..2a13290d81 100644 --- a/puppet/zulip_ops/files/nginx/sites-available/zulip +++ b/puppet/zulip_ops/files/nginx/sites-available/zulip @@ -1,3 +1,4 @@ +include /etc/nginx/zulip-include/trusted-proto; include /etc/nginx/zulip-include/s3-cache; include /etc/nginx/zulip-include/upstreams; include /etc/zulip/nginx_sharding_map.conf; diff --git a/puppet/zulip_ops/files/nginx/sites-available/zulip-staging b/puppet/zulip_ops/files/nginx/sites-available/zulip-staging index 742126c9fa..9e78a54801 100644 --- a/puppet/zulip_ops/files/nginx/sites-available/zulip-staging +++ b/puppet/zulip_ops/files/nginx/sites-available/zulip-staging @@ -5,6 +5,7 @@ server { return 301 https://$server_name$request_uri; } +include /etc/nginx/zulip-include/trusted-proto; include /etc/nginx/zulip-include/s3-cache; include /etc/nginx/zulip-include/upstreams; include /etc/zulip/nginx_sharding_map.conf;