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

[Haw Loeung]

Include X-Cache-Status to all

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Loïc Gomez (kotodama)]

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 2ec5ffab707dc0e8c9e8bd48cb8f8f840e371306

diff --git a/templates/nginx_cfg.tmpl b/templates/nginx_cfg.tmpl
index 864f844..016c27c 100644
--- a/templates/nginx_cfg.tmpl
+++ b/templates/nginx_cfg.tmpl
@@ -45,8 +45,10 @@ server {
         proxy_set_header X-Forwarded-Port "";
         proxy_set_header X-Forwarded-Proto "";
         proxy_set_header X-Forwarded-Scheme "";
-
+{% endif %}
         add_header X-Cache-Status "$upstream_cache_status from {{juju_unit}}";
+{%- if conf['backend'] %}
+
 {%- for key, value in conf.items()|sort(attribute='0') -%}
 {%- if key.startswith('cache-') and value != 'None' %}
         {%- if key == 'cache-valid' %}
diff --git a/tests/unit/files/nginx_config_rendered_test_output-site10.local.txt b/tests/unit/files/nginx_config_rendered_test_output-site10.local.txt
index 3375fb2..8f4f7e7 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site10.local.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site10.local.txt
@@ -9,6 +9,7 @@ server {
 
     location / {
         proxy_cache 009171e23968-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         root /var/www/html;
         if ($args ~* ".*call_user.*") { rewrite ^ /? permanent; }
         if ($args ~* ".*call_user2.*") { rewrite ^ /? permanent; } else { rewrite ^ /somewherelse? permanent; }
diff --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
index 8a3fa3c..6264b6e 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site2.local.txt
@@ -32,12 +32,14 @@ server {
 
     location /my-local-content/ {
         proxy_cache 9813f9fe7826-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         root /var/www/html;
     }
 
 
     location /my-local-content2/ {
         proxy_cache 9813f9fe7826-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         root /var/www/html;
     }
 
diff --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
index 681a1fb..ea197ce 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site4.local.txt
@@ -9,12 +9,14 @@ server {
 
     location / {
         proxy_cache a0bfaa048a6f-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         autoindex on;
     }
 
 
     location /ubuntu/pool/ {
         proxy_cache a0bfaa048a6f-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         autoindex on;
         auth_request /auth;
     }
diff --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
index f0aa33c..c5891ea 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site9.local.txt
@@ -33,6 +33,7 @@ server {
 
     location /private/content {
         proxy_cache 8facdb232d5b-cache;
+        add_header X-Cache-Status "$upstream_cache_status from mock-content-cache/0";
         root /srv/example1.com/content/;
         autoindex on;
         auth_request /auth;