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

[Haw Loeung]

Unmerged commits

258154b... by Haw Loeung on 2021-11-26

WIP

diff --git a/templates/nginx_cfg.tmpl b/templates/nginx_cfg.tmpl
index c3d2ed9..8515864 100644
--- a/templates/nginx_cfg.tmpl
+++ b/templates/nginx_cfg.tmpl
@@ -1,5 +1,13 @@
 proxy_cache_path {{cache_path}}/{{site}} use_temp_path=off levels=1:2 keys_zone={{keys_zone}}:10m {% if cache_inactive_time %}inactive={{cache_inactive_time}} {% endif %}max_size={{cache_max_size}};
 
+{%- for location, conf in locations.items() %}
+upstream {{conf['backend_name']}} {
+    server {{conf['backend']}};
+
+    keepalive 16;
+}
+{% endfor %}
+
 server {
     server_name {{site_name}};
     listen {% if address %}{{address}}:{% endif %}{{port}}{% if reuseport %} reuseport{% endif %};
@@ -12,7 +20,8 @@ server {
     location {% if conf['modifier'] %}{{conf['modifier']}} {% endif %}{{ location }} {
 {%- if conf['backend'] %}
         proxy_http_version 1.1;
-        proxy_pass {{conf['backend']}};
+        proxy_pass http://{{conf['backend_name']}};
+        proxy_set_header Connection "";
         proxy_set_header Host "{{site_name}}";
         # Removed the following headers to avoid cache poisoning.
         proxy_set_header Forwarded "";