From 0d2fc3ebb5cdad27a5bd50453663db592ae2a9b9 Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sun, 1 Jun 2025 18:21:40 +0200
Subject: [PATCH] services/discord_bot: Update deployment

---
 roles/services/handlers/main.yaml            |  2 +-
 roles/services/tasks/discord_bot.yaml        | 10 +++++-----
 roles/services/templates/discord-bot.service |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/services/handlers/main.yaml b/roles/services/handlers/main.yaml
index ed04c9f..47e319a 100644
--- a/roles/services/handlers/main.yaml
+++ b/roles/services/handlers/main.yaml
@@ -20,7 +20,7 @@
     state: restarted
     daemon_reload: true
 
-- name: Restart discord-bot
+- name: restart discord-bot
   ansible.builtin.systemd:
     name: discord-bot
     state: restarted
diff --git a/roles/services/tasks/discord_bot.yaml b/roles/services/tasks/discord_bot.yaml
index 3ce4308..6e5c400 100644
--- a/roles/services/tasks/discord_bot.yaml
+++ b/roles/services/tasks/discord_bot.yaml
@@ -18,7 +18,6 @@
     version: main
     dest: /var/lib/bottle-clip
     accept_hostkey: yes
-  notify: Restart discord-bot
 
 - name: Clone discord-bot source
   ansible.builtin.git:
@@ -26,22 +25,23 @@
     version: main
     dest: /var/lib/discord-bot
     accept_hostkey: yes
-  notify: Restart discord-bot
+  notify: restart discord-bot
 
 - name: Install Python dependencies
   ansible.builtin.shell:
-    cmd: . .venv/bin/activate && pip install -r requirements.txt
+    cmd: . .venv/bin/activate && pip install -e .
   args:
     chdir: /var/lib/discord-bot
+  notify: restart discord-bot
 
-- name: Install service file
+- name: Install discord-bot service file
   ansible.builtin.template:
     src: discord-bot.service
     dest: /etc/systemd/system/discord-bot.service
     owner: root
     group: root
     mode: "0644"
-  notify: Restart discord-bot
+  notify: restart discord-bot
 
 - name: Start discord-bot
   ansible.builtin.systemd:
diff --git a/roles/services/templates/discord-bot.service b/roles/services/templates/discord-bot.service
index 7522fd9..5358bd5 100644
--- a/roles/services/templates/discord-bot.service
+++ b/roles/services/templates/discord-bot.service
@@ -1,19 +1,19 @@
 # {{ ansible_managed }}
 
 [Unit]
-Description=HobbyBot
+Description=Bitlair Discord Bot
 After=network.target
 
 [Service]
 Type=simple
-Restart=on-failure
+Restart=always
 RestartSec=10s
-ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/main.py
+ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/discordbot.py
 DynamicUser=true
 Environment="MQTT_HOST={{ mqtt_internal_host }}"
+Environment="BOTTLECLIP_RESOURCES=/var/lib/bottle-clip"
 Environment="DISCORD_WEBHOOK_URL={{ lookup('passwordstore', 'services/discord', subkey='webhook_url') }}"
 Environment="DISCORD_TOKEN={{ lookup('passwordstore', 'services/discord', subkey='token') }}"
-Environment="BOTTLECLIP_RESOURCES=/var/lib/bottle-clip"
 
 [Install]
 WantedBy=multi-user.target