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

[Haw Loeung]

Sort, sort, sort

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

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

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision 2684be2baa5db7409c4cd93bf57769d405f5c560

diff --git a/config.yaml b/config.yaml
index d100214..5210a97 100644
--- a/config.yaml
+++ b/config.yaml
@@ -25,6 +25,12 @@ options:
     default: "/var/lib/nginx/proxy"
     description: >
       Path or directory to store cached objects.
+  enable_prometheus_metrics:
+    default: true
+    type: boolean
+    description: >
+      Export metrics for the number of requests and the number of cache hits.
+      Prometheus metrics are exposed at /metrics on port 9145.
   log_retention:
     type: int
     default: 30
@@ -81,9 +87,3 @@ options:
     description: >
       Sets the number of Nginx worker processes. Setting to '0' (auto)
       will set based on available CPU cores.
-  enable_prometheus_metrics:
-    default: true
-    type: boolean
-    description: >
-      Export metrics for the number of requests and the number of cache hits.
-      Prometheus metrics are exposed at /metrics on port 9145.
diff --git a/lib/haproxy.py b/lib/haproxy.py
index cd92dbe..46e1431 100644
--- a/lib/haproxy.py
+++ b/lib/haproxy.py
@@ -255,11 +255,11 @@ backend backend-{name}
         template = env.get_template('templates/haproxy_cfg.tmpl')
         return template.render(
             {
-                'listen': self.render_stanza_listen(config),
                 'backend': self.render_stanza_backend(config),
-                'num_threads': num_threads,
+                'listen': self.render_stanza_listen(config),
                 'max_connections': self.max_connections,
                 'monitoring_password': monitoring_password or self.monitoring_password,
+                'num_threads': num_threads,
                 'tls_cipher_suites': tls_cipher_suites,
             }
         )