From a1800a18fc16853b8df4a3106f9b2a07d362b969 Mon Sep 17 00:00:00 2001
From: TuDatTr <tuan-dat.tran@tudattr.dev>
Date: Tue, 6 Dec 2022 23:29:57 +0100
Subject: [PATCH] renamed some variables

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>
---
 group_vars/all/vars.yml                |  7 +++++++
 roles/docker/templates/pi/compose.yaml | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index d261e82..c26d32b 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -61,6 +61,13 @@ zoneminder_data: "{{ docker_data_dir }}/zm/data"
 # pi
 #
 
+traefik_etc: "{{ docker_dir }}/traefik/etc-traefik/"
+traefik_var: "{{ docker_dir }}/traefik/var-log/"
+ddns_updater_data:  "{{ docker_dir }}/ddns-updater/data/"
+ha_config: "{{ docker_dir }}/home-assistant/config/"
+
+pihole_pihole: {{ docker_dir }}/pihole/etc-pihole/
+pihole_dnsmasq: {{ docker_dir }}/pihole/etc-dnsmasq.d/
 #
 # backblaze
 #
diff --git a/roles/docker/templates/pi/compose.yaml b/roles/docker/templates/pi/compose.yaml
index c6649ef..c462c63 100644
--- a/roles/docker/templates/pi/compose.yaml
+++ b/roles/docker/templates/pi/compose.yaml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "{{ docker_dir }}/traefik/etc-traefik/traefik.yml:/etc/traefik/traefik.yml"
-      - "{{ docker_dir }}/traefik/var-log/traefik.log:/var/log/traefik.log"
-      - "{{ docker_dir }}/traefik/var-log/access.log:/var/log/traefik.log"
+      - "{{ traefik_etc }}/traefik.yml:/etc/traefik/traefik.yml"
+      - "{{ traefik_var }}/traefik.log:/var/log/traefik.log"
+      - "{{ traefik_var }}/access.log:/var/log/traefik.log"
     ports:
       - 80:80
       - 8080:8080
@@ -27,7 +27,7 @@ services:
     networks:
       net: {}
     volumes:
-      - "{{ docker_dir }}/ddns-updater/data/:/updater/data/"
+      - "{{ ddns_updater_data }}:/updater/data/"
     ports:
       - 8000:8000/tcp
   homeassistant:
@@ -36,7 +36,7 @@ services:
     restart: unless-stopped
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
-      - "{{ docker_dir }}/home-assistant/config/:/config/"
+      - "{{ ha_config }}:/config/"
     privileged: true
     network_mode: host
     labels:
@@ -63,8 +63,8 @@ services:
       - "DNS1=1.0.0.1"
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
-      - "{{ docker_dir }}/pihole/etc-pihole/:/etc/pihole/"
-      - "{{ docker_dir }}/pihole/etc-dnsmasq.d/:/etc/dnsmasq.d/"
+      - "{{ pihole_pihole }}:/etc/pihole/"
+      - "{{ pihole_dnsmasq }}:/etc/dnsmasq.d/"
     dns:
       - 127.0.0.1
       - 1.1.1.1