diff --git a/roles/services/handlers/main.yaml b/roles/services/handlers/main.yaml index b4feeb3..30f7392 100644 --- a/roles/services/handlers/main.yaml +++ b/roles/services/handlers/main.yaml @@ -13,12 +13,6 @@ state: restarted daemon_reload: true -- name: restart irc-doorduino - systemd: - name: irc-doorduino - state: restarted - daemon_reload: true - - name: restart discord-bot systemd: name: discord-bot @@ -42,9 +36,3 @@ name: mastodon-spacestate state: restarted daemon_reload: true - -- name: restart mqtt-graphite - systemd: - name: mqtt-graphite - state: restarted - daemon_reload: true diff --git a/roles/services/tasks/ircbot.yaml b/roles/services/tasks/ircbot.yaml index ce9eeb0..3a75eb4 100644 --- a/roles/services/tasks/ircbot.yaml +++ b/roles/services/tasks/ircbot.yaml @@ -58,28 +58,3 @@ state: started enabled: yes daemon_reload: true - -- name: Install doorduino notification - 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 - template: - src: irc-doorduino.service - dest: /etc/systemd/system/irc-doorduino.service - owner: root - group: root - mode: 0644 - notify: restart irc-doorduino - -- name: Start irc-doorduino - systemd: - name: irc-doorduino - state: started - enabled: yes - daemon_reload: true diff --git a/roles/services/tasks/main.yaml b/roles/services/tasks/main.yaml index eff7acc..d6d4d17 100644 --- a/roles/services/tasks/main.yaml +++ b/roles/services/tasks/main.yaml @@ -13,6 +13,3 @@ - tags: services_mastodon_spacestate import_tasks: mastodon_spacestate.yaml - -- tags: services_mqtt_graphite - import_tasks: mqtt_graphite.yaml diff --git a/roles/services/tasks/mqtt_graphite.yaml b/roles/services/tasks/mqtt_graphite.yaml deleted file mode 100644 index bbb36f9..0000000 --- a/roles/services/tasks/mqtt_graphite.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- name: Install mqtt-graphite - template: - src: mqtt-graphite.sh - dest: /var/lib/mqtt-graphite.sh - owner: root - group: root - mode: 0755 - notify: restart mqtt-graphite - -- name: Install mqtt-graphite service - template: - src: mqtt-graphite.service - dest: /etc/systemd/system/mqtt-graphite.service - owner: root - group: root - mode: 0644 - notify: restart mqtt-graphite - -- name: Start mqtt-graphite - systemd: - name: mqtt-graphite - state: started - enabled: yes - daemon_reload: true - diff --git a/roles/services/templates/irc-doorduino.service b/roles/services/templates/irc-doorduino.service deleted file mode 100644 index f5f6d5a..0000000 --- a/roles/services/templates/irc-doorduino.service +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by Ansible - -[Unit] -Description=Bitlair IRC doorduino notification -After=network.target -Requires=irc-bot.service - -[Service] -Type=simple -ExecStart=/bin/bash /var/lib/irc-helpers/doorduino.sh -Restart=on-failure -RestartSec=10s -DynamicUser=true - -[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/mqtt-graphite.service b/roles/services/templates/mqtt-graphite.service deleted file mode 100644 index 5ec8a09..0000000 --- a/roles/services/templates/mqtt-graphite.service +++ /dev/null @@ -1,15 +0,0 @@ -# Managed by Ansible - -[Unit] -Description=MQTT to Graphite bridge -After=network.target - -[Service] -Type=simple -ExecStart=/bin/bash /var/lib/mqtt-graphite.sh -Restart=on-failure -RestartSec=10s -DynamicUser=true - -[Install] -WantedBy=multi-user.target diff --git a/roles/services/templates/mqtt-graphite.sh b/roles/services/templates/mqtt-graphite.sh deleted file mode 100644 index b05c973..0000000 --- a/roles/services/templates/mqtt-graphite.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -GRAPHITE_HOST="100.64.0.11" -GRAPHITE_PORT="2003" - -set -eu -set -o pipefail - -mqtt-simple -h {{ mqtt_internal_host }} -t "#" | - while read line; do - topic=$(echo "$line" | cut -d' ' -f1 | sed 's/\//./g' | tr '[:upper:]' '[:lower:]') - value=$(echo "$line" | cut -s -d' ' -f2- | sed 's/closed/0/g;s/open/1/g') - - # Only relay numeric values. - if [[ $value =~ ^-?[0-9]+\.?[0-9]*$ ]]; then - echo "$topic $value $(date +%s)" | nc -q0 "$GRAPHITE_HOST" "$GRAPHITE_PORT" - echo "$topic $value $(date +%s)" - fi - done -