catchup

cdn-quick/docker-compose.yml.j2

@@ -14,6 +14,7 @@ services:
       - ./conf.d:/etc/nginx/conf.d:ro
       - '{{ cache_path | default("./cache") }}:/etc/nginx/cache'
       - /etc/localtime:/etc/localtime:ro
+      - ./sites:/data/sites:ro
     environment:
       EXTERNAL_REAL_IP: '1'
       MAX_CACHE_SIZE: '{{ max_cache_size | default("10g") }}'

cloudflared/docker-compose.yml.j2

@@ -2,6 +2,6 @@ version: '2.4'
 services:
   cloudflared:
     restart: always
-    image: cloudflare/cloudflared:{{version}}
+    image: cloudflare/cloudflared:{{version | default('latest')}}
     network_mode: host
     command: '{{command}}'

outer-babeld/templates/babeld.conf.j2

@@ -12,5 +12,5 @@ reflect-kernel-metric true
 # local-port-readwrite 33123
 
 {% for interface in interfaces %}
-interface {{interface}} type wired
+interface {{ interface.name|default(interface) }} type {{ interface.type|default('wired') }}
 {% endfor %}