Content Cache Charm

Merge ~nick-moffitt/content-cache-charm:absolute-redirect into content-cache-charm:master

  1. Git
  2. lp:~nick-moffitt/content-cache-charm
  3. absolute-redirect
  4. Merge into master
Proposed by Nick Moffitt
Status: Merged
Approved by: Tom Haddon
Approved revision: 8b756efbdfe6825f4ed260f87f780164a268ab54
Merged at revision: 6201489d39bde0b769e6ad7648bba2173240ce17
Proposed branch: ~nick-moffitt/content-cache-charm:absolute-redirect
Merge into: content-cache-charm:master
Diff against target: 120 lines (+10/-0)
10 files modified
templates/nginx_cfg.tmpl (+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-site4.local.txt (+1/-0)
tests/unit/files/nginx_config_rendered_test_output-site5.txt (+1/-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 (+1/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+370325@code.launchpad.net

Commit message

Do not surface http:// in 30Xes

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
Haw Loeung (hloeung) wrote :

Can we fix the commit message to not reference an RT ticket? This is a public charm so best not leak internal things.

Also, can we get the unit tests fixed for this change?

Revision history for this message
Nick Moffitt (nick-moffitt) wrote :

> Can we fix the commit message to not reference an RT ticket? This is a public
> charm so best not leak internal things.
>
> Also, can we get the unit tests fixed for this change?

Both fixed now, and I think I learned how to properly rebase!

Revision history for this message
Nick Moffitt (nick-moffitt) wrote :

(and the commit message fixed too)

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision 6201489d39bde0b769e6ad7648bba2173240ce17

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 e722f50..6e795a4 100644
3--- a/templates/nginx_cfg.tmpl
4+++ b/templates/nginx_cfg.tmpl
5@@ -5,6 +5,7 @@ server {
6 listen {% if address %}{{address}}:{% endif %}{{port}};
7
8 port_in_redirect off;
9+ absolute_redirect off;
10
11 {%- for location, conf in locations.items() %}
12
13diff --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
14index c74d947..1719597 100644
15--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
16+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local-secrets.txt
17@@ -5,6 +5,7 @@ server {
18 listen 127.0.0.1:6080;
19
20 port_in_redirect off;
21+ absolute_redirect off;
22
23 location / {
24 proxy_pass http://localhost:8080;
25diff --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
26index e519fda..1ddeae4 100644
27--- a/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
28+++ b/tests/unit/files/nginx_config_rendered_test_output-site1.local.txt
29@@ -5,6 +5,7 @@ server {
30 listen 127.0.0.1:6080;
31
32 port_in_redirect off;
33+ absolute_redirect off;
34
35 location / {
36 proxy_pass http://localhost:8080;
37diff --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
38index 4181a1c..e6b9d51 100644
39--- a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
40+++ b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
41@@ -5,6 +5,7 @@ server {
42 listen 127.0.0.1:6081;
43
44 port_in_redirect off;
45+ absolute_redirect off;
46
47 location / {
48 proxy_pass http://localhost:8081;
49diff --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
50index 0fde29f..ca3b701 100644
51--- a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
52+++ b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
53@@ -5,6 +5,7 @@ server {
54 listen 127.0.0.1:6082;
55
56 port_in_redirect off;
57+ absolute_redirect off;
58
59 location / {
60 proxy_pass http://localhost:8082;
61diff --git a/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt
62index b463ce9..1ba0a6b 100644
63--- a/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt
64+++ b/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt
65@@ -5,6 +5,7 @@ server {
66 listen 127.0.0.1:6083;
67
68 port_in_redirect off;
69+ absolute_redirect off;
70
71 location / {
72 autoindex on;
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 1e7fe30..6a9ea98 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@@ -5,6 +5,7 @@ server {
78 listen 127.0.0.1:6084;
79
80 port_in_redirect off;
81+ absolute_redirect off;
82
83 location / {
84 proxy_pass http://localhost:8083;
85diff --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
86index b718f44..3615b97 100644
87--- a/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
88+++ b/tests/unit/files/nginx_config_rendered_test_output-site6.local.txt
89@@ -5,6 +5,7 @@ server {
90 listen 127.0.0.1:6085;
91
92 port_in_redirect off;
93+ absolute_redirect off;
94
95 location / {
96 proxy_pass http://localhost:8085;
97diff --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
98index eef656b..7a55346 100644
99--- a/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
100+++ b/tests/unit/files/nginx_config_rendered_test_output-site7.local.txt
101@@ -5,6 +5,7 @@ server {
102 listen 127.0.0.1:6086;
103
104 port_in_redirect off;
105+ absolute_redirect off;
106
107 location / {
108 proxy_pass http://localhost:8086;
109diff --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
110index 3129716..2da0bd0 100644
111--- a/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
112+++ b/tests/unit/files/nginx_config_rendered_test_output-site8.local.txt
113@@ -5,6 +5,7 @@ server {
114 listen 127.0.0.1:6087;
115
116 port_in_redirect off;
117+ absolute_redirect off;
118
119 location / {
120 proxy_pass http://localhost:8087;

Subscribers

People subscribed via source and target branches