From 83b33455f024505b49a7b6c37e5421562ddc7b30 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Fri, 11 Oct 2024 11:29:20 +0200
Subject: [PATCH] harmonize 'dir' variables

---
 playbooks/apps/goatcounter.yaml                    | 14 +++++++-------
 playbooks/apps/lyon-transports.yaml                |  1 +
 playbooks/apps/templates/goatcounter.service.j2    |  2 +-
 .../apps/templates/lyon-transports.service.j2      |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/playbooks/apps/goatcounter.yaml b/playbooks/apps/goatcounter.yaml
index 414023b..0cd325d 100644
--- a/playbooks/apps/goatcounter.yaml
+++ b/playbooks/apps/goatcounter.yaml
@@ -15,22 +15,22 @@
     - name: Download binary
       ansible.builtin.get_url:
         url: https://github.com/arp242/goatcounter/releases/download/{{ release.tag }}/goatcounter-{{ release.tag }}-linux-amd64.gz
-        dest: "{{ base_dir }}/goatcounter-{{ release.tag }}.gz"
+        dest: "{{ dir }}/goatcounter-{{ release.tag }}.gz"
         mode: "0644"
         owner: gaugendre
         group: gaugendre
     - name: Uncompress
-      ansible.builtin.command: gunzip {{ base_dir }}/goatcounter-{{ release.tag }}.gz
+      ansible.builtin.command: gunzip {{ dir }}/goatcounter-{{ release.tag }}.gz
       args:
-        creates: "{{ base_dir }}/goatcounter-{{ release.tag }}"
+        creates: "{{ dir }}/goatcounter-{{ release.tag }}"
     - name: Make executable
       ansible.builtin.file:
-        path: "{{ base_dir }}/goatcounter-{{ release.tag }}"
+        path: "{{ dir }}/goatcounter-{{ release.tag }}"
         mode: "0775"
     - name: Symlink
       ansible.builtin.file:
-        src: "{{ base_dir }}/goatcounter-{{ release.tag }}"
-        dest: "{{ base_dir }}/goatcounter"
+        src: "{{ dir }}/goatcounter-{{ release.tag }}"
+        dest: "{{ dir }}/goatcounter"
         state: link
     - name: Write service unit file
       become: true
@@ -65,7 +65,7 @@
 
   vars:
     ansible_python_interpreter: /tmp/ansible/bin/python
-    base_dir: /mnt/data/goatcounter
+    dir: /mnt/data/goatcounter
     gc_mailgun_api_key: !vault |
       $ANSIBLE_VAULT;1.1;AES256
       31386237653033306338393237353961396535363061363931643863653461333631376365663338
diff --git a/playbooks/apps/lyon-transports.yaml b/playbooks/apps/lyon-transports.yaml
index be2157c..fbdb6fa 100644
--- a/playbooks/apps/lyon-transports.yaml
+++ b/playbooks/apps/lyon-transports.yaml
@@ -35,6 +35,7 @@
         state: restarted
 
   vars:
+    dir: /mnt/data/lyon-transports
     lyon_transports_password: !vault |
       $ANSIBLE_VAULT;1.1;AES256
       35356364616633356164376433623139333165626433303437666266613762643239373730616131
diff --git a/playbooks/apps/templates/goatcounter.service.j2 b/playbooks/apps/templates/goatcounter.service.j2
index ad8156f..70d40e5 100644
--- a/playbooks/apps/templates/goatcounter.service.j2
+++ b/playbooks/apps/templates/goatcounter.service.j2
@@ -3,7 +3,7 @@ Description=Goatcounter
 After=network.target
 
 [Service]
-ExecStart={{base_dir}}/goatcounter serve -listen *:8005 -tls http -smtp smtps://goatcounter%%40mg.augendre.info:{{gc_mailgun_api_key}}@smtp.mailgun.org:587 -email-from goatcounter@mg.augendre.info -automigrate -db sqlite+{{base_dir}}/db/goatcounter.sqlite3
+ExecStart={{ dir }}/goatcounter serve -listen *:8005 -tls http -smtp smtps://goatcounter%%40mg.augendre.info:{{gc_mailgun_api_key}}@smtp.mailgun.org:587 -email-from goatcounter@mg.augendre.info -automigrate -db sqlite+{{ dir }}/db/goatcounter.sqlite3
 Type=simple
 Restart=always
 User=gaugendre
diff --git a/playbooks/apps/templates/lyon-transports.service.j2 b/playbooks/apps/templates/lyon-transports.service.j2
index 44adda1..0b27189 100644
--- a/playbooks/apps/templates/lyon-transports.service.j2
+++ b/playbooks/apps/templates/lyon-transports.service.j2
@@ -3,7 +3,7 @@ Description=Lyon transports API
 After=network.target
 
 [Service]
-ExecStart=/mnt/data/lyon-transports/lyon-transports-linux-amd64 --host 0.0.0.0 --port 8013 -u {{ lyon_transports_username }} -p {{ lyon_transports_password }} --cors-allowed-origin https://display.augendre.info
+ExecStart={{ dir }}/lyon-transports-linux-amd64 --host 0.0.0.0 --port 8013 -u {{ lyon_transports_username }} -p {{ lyon_transports_password }} --cors-allowed-origin https://display.augendre.info
 Type=simple
 Restart=always
 User=gaugendre