From 0f1740005af89d0ed67b441ef86f93ee468034af Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Sun, 1 Jun 2025 19:49:38 +0200 Subject: [PATCH] services: Switch new IRC bot to #bitlair --- roles/services/handlers/main.yaml | 12 ----- roles/services/tasks/ircbot.yaml | 63 ----------------------- roles/services/templates/irc-bot.service | 4 +- roles/services/templates/irc-doorduino.sh | 24 --------- roles/services/templates/irc-photos.sh | 13 ----- 5 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 roles/services/templates/irc-doorduino.sh delete mode 100644 roles/services/templates/irc-photos.sh diff --git a/roles/services/handlers/main.yaml b/roles/services/handlers/main.yaml index 61e0d31..d8675bf 100644 --- a/roles/services/handlers/main.yaml +++ b/roles/services/handlers/main.yaml @@ -8,18 +8,6 @@ state: restarted daemon_reload: true -- name: Restart irc-photos - ansible.builtin.systemd: - name: irc-photos - state: restarted - daemon_reload: true - -- name: Restart irc-doorduino - ansible.builtin.systemd: - name: irc-doorduino - state: restarted - daemon_reload: true - - name: restart discord-bot ansible.builtin.systemd: name: discord-bot diff --git a/roles/services/tasks/ircbot.yaml b/roles/services/tasks/ircbot.yaml index 19a5c60..9be8246 100644 --- a/roles/services/tasks/ircbot.yaml +++ b/roles/services/tasks/ircbot.yaml @@ -32,66 +32,3 @@ state: started enabled: true daemon_reload: true - -- name: Create helpers dir - ansible.builtin.file: - path: /var/lib/irc-helpers - state: directory - -- name: Install photos notification - ansible.builtin.template: - src: irc-photos.sh - dest: /var/lib/irc-helpers/photos.sh - owner: root - group: root - mode: 0755 - notify: Restart irc-photos - -- name: Install photos notification service - ansible.builtin.template: - src: generic.service - dest: /etc/systemd/system/irc-photos.service - owner: root - group: root - mode: 0644 - vars: - description: Bitlair IRC photos notification - requires: ircbot.service - exec: /bin/bash /var/lib/irc-helpers/photos.sh - notify: Restart irc-photos - -- name: Start irc-photos - ansible.builtin.systemd: - name: irc-photos - state: started - enabled: true - daemon_reload: true - -- name: Install doorduino notification - ansible.builtin.template: - src: irc-doorduino.sh - dest: /var/lib/irc-helpers/doorduino.sh - owner: root - group: root - mode: 0755 - notify: Restart irc-doorduino - -- name: Install doorduino notification service - ansible.builtin.template: - src: generic.service - dest: /etc/systemd/system/irc-doorduino.service - owner: root - group: root - mode: 0644 - vars: - description: Bitlair IRC doorduino notification - requires: ircbot.service - exec: /bin/bash /var/lib/irc-helpers/doorduino.sh - notify: Restart irc-doorduino - -- name: Start irc-doorduino - ansible.builtin.systemd: - name: irc-doorduino - state: started - enabled: true - daemon_reload: true diff --git a/roles/services/templates/irc-bot.service b/roles/services/templates/irc-bot.service index ce3018b..1ea843b 100644 --- a/roles/services/templates/irc-bot.service +++ b/roles/services/templates/irc-bot.service @@ -13,8 +13,8 @@ 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" +Environment="IRC_CHANNEL=#bitlair" +Environment="IRC_NICK=bitlair" [Install] WantedBy=multi-user.target diff --git a/roles/services/templates/irc-doorduino.sh b/roles/services/templates/irc-doorduino.sh deleted file mode 100644 index 29e0eea..0000000 --- a/roles/services/templates/irc-doorduino.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Managed by Ansible - -set -eu -set -o pipefail - -initial=1 - -mqtt-simple -h {{ mqtt_internal_host }} -t "bitlair/doorduino/+" | - while read line; do - topic=$(echo "$line" | cut -d' ' -f1 | sed "s/bitlair\/doorduino\///") - value=$(echo "$line" | cut -s -d' ' -f2-) - - if [ $initial == 0 ] && [ $value != 0 ]; then - if [ $topic == "doorbell" ]; then - irc-say "DEURBEL! Open de deur beneden!" - elif [ $topic != "dooropen" ]; then - irc-say "Doorduino: $topic $value" - fi - fi - initial=0 - done - diff --git a/roles/services/templates/irc-photos.sh b/roles/services/templates/irc-photos.sh deleted file mode 100644 index acd505c..0000000 --- a/roles/services/templates/irc-photos.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Managed by Ansible - -set -eu -set -o pipefail - -mqtt-simple -h {{ mqtt_internal_host }} -s "bitlair/photos" | - while read event; do - path=$(echo $event | cut -d ' ' -f 2) - url="https://bitlair.nl/fotos/view/$path" - irc-say "WIP: $url" - done