Content Cache Charm

Merge ~hloeung/content-cache-charm:master into content-cache-charm:master

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: ca99c189da93988ba7119b0561e126618f52980e
Merged at revision: fbae34a29e01a46e5eab8a040f1dcc187d2cbfd2
Proposed branch: ~hloeung/content-cache-charm:master
Merge into: content-cache-charm:master
Diff against target: 160 lines (+14/-0)
12 files modified
templates/nginx_cfg.tmpl (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-basic_site.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site1.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site2.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site3.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site5.txt (+2/-0)
tests/unit/files/nginx_config_rendered_test_output-site6.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site7.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site8.local.txt (+2/-0)
tests/unit/files/nginx_config_rendered_test_output-site9.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-token_site.txt (+1/-0)
Reviewer Review Type Date Requested Status
Stephen Muss (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+383677@code.launchpad.net

Commit message

Also strip out X-Forwarded-Proto which was missed earlier and used by k8s ingress

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stephen Muss (stephenmuss) wrote :

lgtm

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision fbae34a29e01a46e5eab8a040f1dcc187d2cbfd2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/nginx_cfg.tmpl b/templates/nginx_cfg.tmpl
2index c583365..fae0d85 100644
3--- a/templates/nginx_cfg.tmpl
4+++ b/templates/nginx_cfg.tmpl
5@@ -17,6 +17,7 @@ server {
6 proxy_set_header Forwarded "";
7 proxy_set_header X-Forwarded-Host "";
8 proxy_set_header X-Forwarded-Port "";
9+ proxy_set_header X-Forwarded-Proto "";
10 proxy_set_header X-Forwarded-Scheme "";
11
12 add_header X-Cache-Status "$upstream_cache_status from {{juju_unit}}";
13diff --git a/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt b/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
14index c4c29c7..7add210 100644
15--- a/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
16+++ b/tests/unit/files/nginx_config_rendered_test_output-basic_site.txt
17@@ -14,6 +14,7 @@ server {
18 proxy_set_header Forwarded "";
19 proxy_set_header X-Forwarded-Host "";
20 proxy_set_header X-Forwarded-Port "";
21+ proxy_set_header X-Forwarded-Proto "";
22 proxy_set_header X-Forwarded-Scheme "";
23
24 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
25diff --git a/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt b/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
26index 17f7fba..69c9322 100644
27--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
28+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
29@@ -14,6 +14,7 @@ server {
30 proxy_set_header Forwarded "";
31 proxy_set_header X-Forwarded-Host "";
32 proxy_set_header X-Forwarded-Port "";
33+ proxy_set_header X-Forwarded-Proto "";
34 proxy_set_header X-Forwarded-Scheme "";
35
36 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
37diff --git a/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
38index cc34e05..42bf104 100644
39--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
40+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
41@@ -14,6 +14,7 @@ server {
42 proxy_set_header Forwarded "";
43 proxy_set_header X-Forwarded-Host "";
44 proxy_set_header X-Forwarded-Port "";
45+ proxy_set_header X-Forwarded-Proto "";
46 proxy_set_header X-Forwarded-Scheme "";
47
48 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
49diff --git a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
50index a2823f5..ae5bca2 100644
51--- a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
52+++ b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
53@@ -14,6 +14,7 @@ server {
54 proxy_set_header Forwarded "";
55 proxy_set_header X-Forwarded-Host "";
56 proxy_set_header X-Forwarded-Port "";
57+ proxy_set_header X-Forwarded-Proto "";
58 proxy_set_header X-Forwarded-Scheme "";
59
60 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
61diff --git a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
62index 40da73c..a544361 100644
63--- a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
64+++ b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
65@@ -14,6 +14,7 @@ server {
66 proxy_set_header Forwarded "";
67 proxy_set_header X-Forwarded-Host "";
68 proxy_set_header X-Forwarded-Port "";
69+ proxy_set_header X-Forwarded-Proto "";
70 proxy_set_header X-Forwarded-Scheme "";
71
72 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
73diff --git a/tests/unit/files/nginx_config_rendered_test_output-site5.txt b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
74index 1dd3549..13fdb3e 100644
75--- a/tests/unit/files/nginx_config_rendered_test_output-site5.txt
76+++ b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
77@@ -14,6 +14,7 @@ server {
78 proxy_set_header Forwarded "";
79 proxy_set_header X-Forwarded-Host "";
80 proxy_set_header X-Forwarded-Port "";
81+ proxy_set_header X-Forwarded-Proto "";
82 proxy_set_header X-Forwarded-Scheme "";
83
84 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
85@@ -35,6 +36,7 @@ server {
86 proxy_set_header Forwarded "";
87 proxy_set_header X-Forwarded-Host "";
88 proxy_set_header X-Forwarded-Port "";
89+ proxy_set_header X-Forwarded-Proto "";
90 proxy_set_header X-Forwarded-Scheme "";
91
92 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
93diff --git a/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
94index 0663432..5fe307e 100644
95--- a/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
96+++ b/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
97@@ -14,6 +14,7 @@ server {
98 proxy_set_header Forwarded "";
99 proxy_set_header X-Forwarded-Host "";
100 proxy_set_header X-Forwarded-Port "";
101+ proxy_set_header X-Forwarded-Proto "";
102 proxy_set_header X-Forwarded-Scheme "";
103
104 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
105diff --git a/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
106index b87d1ee..dde8e0e 100644
107--- a/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
108+++ b/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
109@@ -14,6 +14,7 @@ server {
110 proxy_set_header Forwarded "";
111 proxy_set_header X-Forwarded-Host "";
112 proxy_set_header X-Forwarded-Port "";
113+ proxy_set_header X-Forwarded-Proto "";
114 proxy_set_header X-Forwarded-Scheme "";
115
116 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
117diff --git a/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
118index e21326b..17295b3 100644
119--- a/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
120+++ b/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
121@@ -14,6 +14,7 @@ server {
122 proxy_set_header Forwarded "";
123 proxy_set_header X-Forwarded-Host "";
124 proxy_set_header X-Forwarded-Port "";
125+ proxy_set_header X-Forwarded-Proto "";
126 proxy_set_header X-Forwarded-Scheme "";
127
128 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
129@@ -35,6 +36,7 @@ server {
130 proxy_set_header Forwarded "";
131 proxy_set_header X-Forwarded-Host "";
132 proxy_set_header X-Forwarded-Port "";
133+ proxy_set_header X-Forwarded-Proto "";
134 proxy_set_header X-Forwarded-Scheme "";
135
136 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
137diff --git a/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
138index 44d8b57..a709dac 100644
139--- a/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
140+++ b/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
141@@ -14,6 +14,7 @@ server {
142 proxy_set_header Forwarded "";
143 proxy_set_header X-Forwarded-Host "";
144 proxy_set_header X-Forwarded-Port "";
145+ proxy_set_header X-Forwarded-Proto "";
146 proxy_set_header X-Forwarded-Scheme "";
147
148 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
149diff --git a/tests/unit/files/nginx_config_rendered_test_output-token_site.txt b/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
150index ffd7b0b..3eed240 100644
151--- a/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
152+++ b/tests/unit/files/nginx_config_rendered_test_output-token_site.txt
153@@ -14,6 +14,7 @@ server {
154 proxy_set_header Forwarded "";
155 proxy_set_header X-Forwarded-Host "";
156 proxy_set_header X-Forwarded-Port "";
157+ proxy_set_header X-Forwarded-Proto "";
158 proxy_set_header X-Forwarded-Scheme "";
159
160 add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";

Subscribers

People subscribed via source and target branches