From debdbb6af1bef3a6485987c32b9ccd83a12f814b Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 30 Nov 2022 16:46:15 +0100
Subject: [PATCH] [thelounge] Gardening

---
 group_vars/thelounge.yml          | 3 +++
 host_vars/zamok.adm.crans.org.yml | 2 +-
 roles/thelounge/tasks/main.yml    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/group_vars/thelounge.yml b/group_vars/thelounge.yml
index d163665c..d2fe4a9e 100644
--- a/group_vars/thelounge.yml
+++ b/group_vars/thelounge.yml
@@ -1,5 +1,8 @@
 ---
 glob_thelounge:
+  version:
+    short: 4.3.1
+    long: 4.3.1-2
   public: "false"
   host: "undefined"
   reverseProxy: "false"
diff --git a/host_vars/zamok.adm.crans.org.yml b/host_vars/zamok.adm.crans.org.yml
index 2ca56e49..f361edb4 100644
--- a/host_vars/zamok.adm.crans.org.yml
+++ b/host_vars/zamok.adm.crans.org.yml
@@ -10,7 +10,7 @@ loc_borg:
     - /var/lib/mysql
 
 loc_thelounge:
-  host: "\"{{ query('ldap', 'ip4, 'zamok', 'adm') }}\""
+  host: "\"{{ query('ldap', 'ip4', 'zamok', 'adm') }}\""
   oidentd: "\"/usr/local/lib/thelounge/.oidentd.conf\""
   reverseProxy: "true"
   ldap_enable: "true"
diff --git a/roles/thelounge/tasks/main.yml b/roles/thelounge/tasks/main.yml
index 7403a1dc..03d598ea 100644
--- a/roles/thelounge/tasks/main.yml
+++ b/roles/thelounge/tasks/main.yml
@@ -10,8 +10,8 @@
 
 - name: Download The Lounge packet
   get_url:
-    url: https://github.com/thelounge/thelounge/releases/download/v4.2.0/thelounge_4.2.0_all.deb
-    dest: /var/cache/apt/archives/thelounge_4.2.0_all.deb
+    url: https://github.com/thelounge/thelounge/releases/download/v{{ thelounge.version.short }}/thelounge_{{ thelounge.version.long }}_all.deb
+    dest: /var/cache/apt/archives/thelounge_{{ thelounge.version.long }}_all.deb
     checksum: sha512:10d17c199fef595c46ba55f36ab7aa0a7469448603482eb780284e05532f5d69302d47bdc9c558badc30b0a026767a24b7065a4fe8d7c865f1737b0041420208
     owner: root
     group: root
@@ -19,7 +19,7 @@
 
 - name: Install The Lounge from the deb package
   apt:
-    deb: /var/cache/apt/archives/thelounge_4.2.0_all.deb
+    deb: /var/cache/apt/archives/thelounge_{{ thelounge.version.long }}_all.deb
   notify: Restart The Lounge
 
 - name: Deploy The Lounge configuration