From 2a7b7ba7e9f5e8bc8a1fe20d4acb6261abbccb18 Mon Sep 17 00:00:00 2001
From: Mike Wilson <mikewilzn@gmail.com>
Date: Thu, 12 Jun 2025 15:17:02 -0400
Subject: [PATCH] Templatize docker volume paths in wger docker-compose.yml

---
 .../roles/wger/templates/docker-compose.yml   | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/ansible/roles/wger/templates/docker-compose.yml b/ansible/roles/wger/templates/docker-compose.yml
index 9bed178..affc576 100644
--- a/ansible/roles/wger/templates/docker-compose.yml
+++ b/ansible/roles/wger/templates/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   traefik:
     external: true
@@ -15,10 +13,10 @@ services:
     networks:
       - default
     env_file:
-      - /mnt/tank/appdata/wger/config/prod.env
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
     volumes:
-      - /mnt/tank/appdata/wger/static:/home/wger/static
-      - /mnt/tank/appdata/wger/media:/home/wger/media
+      - {{ data_dir }}/{{ role_name }}/static:/home/wger/static
+      - {{ data_dir }}/{{ role_name }}/media:/home/wger/media
     expose:
       - 8000
     healthcheck:
@@ -37,9 +35,9 @@ services:
       - traefik
       - default
     volumes:
-      - /mnt/tank/appdata/wger/config/nginx.conf:/etc/nginx/conf.d/default.conf
-      - /mnt/tank/appdata/wger/static:/wger/static:ro
-      - /mnt/tank/appdata/wger/media:/wger/media:ro
+      - {{ data_dir }}/{{ role_name }}/config/nginx.conf:/etc/nginx/conf.d/default.conf
+      - {{ data_dir }}/{{ role_name }}/static:/wger/static:ro
+      - {{ data_dir }}/{{ role_name }}/media:/wger/media:ro
     healthcheck:
       test: service nginx status
       interval: 10s
@@ -49,7 +47,7 @@ services:
     restart: unless-stopped
     labels:
       traefik.enable: true
-      traefik.http.routers.wger.rule: "Host(`wger.mjwilson.org`)"
+      traefik.http.routers.wger.rule: "Host(`wger.{{ personal_domain }}`)"
       #traefik.http.services.wger.loadbalancer.server.port: 8000
       #traefik.http.routers.wger.middlewares: lan-whitelist@file
 
@@ -59,11 +57,11 @@ services:
       - POSTGRES_USER=wger
       - POSTGRES_PASSWORD=wger
       - POSTGRES_DB=wger
-      - TZ=Europe/Berlin
+      - "TZ={{ timezone }}"
     networks:
       - default
     volumes:
-      - /mnt/tank/appdata/postgres/wger:/var/lib/postgresql/data/
+      - {{ data_dir }}/postgres/{{ role_name }}:/var/lib/postgresql/data/
     expose:
       - 5432
     healthcheck:
@@ -81,8 +79,8 @@ services:
     networks:
       - default
     volumes:
-      - /mnt/tank/appdata/wger/config/redis.conf:/usr/local/etc/redis/redis.conf
-      - /mnt/tank/appdata/redis/wger/data:/data
+      - {{ data_dir }}/{{ role_name }}/config/redis.conf:/usr/local/etc/redis/redis.conf
+      - {{ data_dir }}/redis/{{ role_name }}/data:/data
     command: [ "redis-server", "/usr/local/etc/redis/redis.conf"]
     healthcheck:
       test: redis-cli ping
@@ -102,9 +100,9 @@ services:
     networks:
       - default
     env_file:
-      - /mnt/tank/appdata/wger/config/prod.env
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
     volumes:
-      - /mnt/tank/appdata/wger/media:/home/wger/media
+      - {{ data_dir }}/{{ role_name }}/media:/home/wger/media
     depends_on:
       web:
         condition: service_healthy
@@ -121,9 +119,9 @@ services:
     networks:
       - default
     volumes:
-      - /mnt/tank/appdata/wger/celery-beat:/home/wger/beat/
+      - {{ data_dir }}/{{ role_name }}/celery-beat:/home/wger/beat/
     env_file:
-      - /mnt/tank/appdata/wger/config/prod.env
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
     depends_on:
       celery_worker:
         condition: service_healthy