roles/services/handlers/main.yaml

@@ -2,9 +2,9 @@
 - ansible.builtin.import_tasks:
     file: ../../common/handlers/main.yaml
 
-- name: Restart ircbot
+- name: Restart irc-bot
   ansible.builtin.systemd:
-    name: ircbot
+    name: irc-bot
     state: restarted
     daemon_reload: true
 
@@ -20,18 +20,12 @@
     state: restarted
     daemon_reload: true
 
-- name: restart discord-bot
+- name: Restart discord-bot
   ansible.builtin.systemd:
     name: discord-bot
     state: restarted
     daemon_reload: true
 
-- name: restart irc-bot
-  ansible.builtin.systemd:
-    name: irc-bot
-    state: restarted
-    daemon_reload: true
-
 - name: Restart siahsd
   ansible.builtin.systemd:
     name: siahsd

roles/services/tasks/discord_bot.yaml

@@ -18,6 +18,7 @@
     version: main
     dest: /var/lib/bottle-clip
     accept_hostkey: yes
+  notify: Restart discord-bot
 
 - name: Clone discord-bot source
   ansible.builtin.git:
@@ -25,36 +26,22 @@
     version: main
     dest: /var/lib/discord-bot
     accept_hostkey: yes
-  notify:
-    - restart discord-bot
-    - restart irc-bot
+  notify: Restart discord-bot
 
 - name: Install Python dependencies
   ansible.builtin.shell:
-    cmd: . .venv/bin/activate && pip install -e .
+    cmd: . .venv/bin/activate && pip install -r requirements.txt
   args:
     chdir: /var/lib/discord-bot
-  notify:
-    - restart discord-bot
-    - restart irc-bot
 
-- name: Install discord-bot service file
+- name: Install 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
-
-- name: Install irc-bot service file
-  ansible.builtin.template:
-    src: irc-bot.service
-    dest: /etc/systemd/system/irc-bot.service
-    owner: root
-    group: root
-    mode: "0644"
-  notify: restart irc-bot
+  notify: Restart discord-bot
 
 - name: Start discord-bot
   ansible.builtin.systemd:
@@ -62,10 +49,3 @@
     state: started
     enabled: true
     daemon_reload: true
-
-- name: Start irc-bot
-  ansible.builtin.systemd:
-    name: irc-bot
-    state: started
-    enabled: true
-    daemon_reload: true

roles/services/tasks/ircbot.yaml

@@ -6,7 +6,7 @@
     dest: /var/lib/irc-bot
     accept_hostkey: yes
   ignore_errors: true
-  notify: Restart ircbot
+  notify: Restart irc-bot
 
 - name: Link irc-say
   ansible.builtin.file:
@@ -17,18 +17,18 @@
 - name: Install service file
   ansible.builtin.template:
     src: generic.service
-    dest: /etc/systemd/system/ircbot.service
+    dest: /etc/systemd/system/irc-bot.service
     owner: root
     group: root
     mode: 0644
   vars:
     description: Bitlair IRC bot
     exec: /bin/bash /var/lib/irc-bot/irc-bot
-  notify: Restart ircbot
+  notify: Restart irc-bot
 
-- name: Start ircbot
+- name: Start irc-bot
   ansible.builtin.systemd:
-    name: ircbot
+    name: irc-bot
     state: started
     enabled: true
     daemon_reload: true
@@ -56,7 +56,7 @@
     mode: 0644
   vars:
     description: Bitlair IRC photos notification
-    requires: ircbot.service
+    requires: irc-bot.service
     exec: /bin/bash /var/lib/irc-helpers/photos.sh
   notify: Restart irc-photos
 
@@ -85,7 +85,7 @@
     mode: 0644
   vars:
     description: Bitlair IRC doorduino notification
-    requires: ircbot.service
+    requires: irc-bot.service
     exec: /bin/bash /var/lib/irc-helpers/doorduino.sh
   notify: Restart irc-doorduino
 

roles/services/templates/discord-bot.service

@@ -1,19 +1,19 @@
 # {{ ansible_managed }}
 
 [Unit]
-Description=Bitlair Discord Bot
+Description=HobbyBot
 After=network.target
 
 [Service]
 Type=simple
-Restart=always
+Restart=on-failure
 RestartSec=10s
-ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/discordbot.py
+ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/main.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

roles/services/templates/irc-bot.service

@@ -1,20 +0,0 @@
-# {{ ansible_managed }}
-
-[Unit]
-Description=Bitlair IRC Bot
-After=network.target
-
-[Service]
-Type=simple
-Restart=always
-RestartSec=10s
-ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/ircbot.py
-DynamicUser=true
-Environment="MQTT_HOST={{ mqtt_internal_host }}"
-Environment="BOTTLECLIP_RESOURCES=/var/lib/bottle-clip"
-Environment="IRC_SERVER=irc.smurfnet.ch"
-Environment="IRC_CHANNEL=#bitlair-bot-test"
-Environment="IRC_NICK=Bitlair"
-
-[Install]
-WantedBy=multi-user.target