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

[Haw Loeung]

Fixed invalid config in Nginx - proxy_cache_maxconn

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

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

[Barry Price (barryprice)]

+1

review: Approve

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

Change successfully merged at revision 30e643cd476ed52403ca3d42f3d32f81342b136a

diff --git a/lib/nginx.py b/lib/nginx.py
index e05f727..ff58d60 100644
--- a/lib/nginx.py
+++ b/lib/nginx.py
@@ -94,7 +94,7 @@ class NginxConf:
     def _generate_keys_zone(self, name):
         return '{}-cache'.format(hashlib.md5(name.encode('UTF-8')).hexdigest()[0:12])
 
-    def _process_locations(self, locations):
+    def _process_locations(self, locations):  # NOQA: C901
         conf = {}
         for location, loc_conf in locations.items():
             conf[location] = deepcopy(loc_conf)
@@ -118,6 +118,11 @@ class NginxConf:
                 elif 'cache-valid' in lc:
                     cache_val = lc['cache-valid']
 
+                # No such thing as proxy_cache_maxconn, this is more used by
+                # HAProxy so remove/ignore here.
+                if 'cache-maxconn' in lc:
+                    lc.pop('cache-maxconn')
+
                 lc['cache-valid'] = []
                 # Support multiple cache-validities per LP:1873116.
                 if isinstance(cache_val, str):
diff --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
index fba7847..2a1b852 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site3.local.txt
@@ -15,7 +15,6 @@ server {
         proxy_cache d515cd6e60b1-cache;
         proxy_cache_background_update on;
         proxy_cache_lock on;
-        proxy_cache_maxconn 4096;
         proxy_cache_min_uses 1;
         proxy_cache_revalidate on;
         proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;