From fd6cc59b4854c46366023e718ad520e646ffb7ee Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sun, 10 Sep 2023 18:32:45 +0200
Subject: [PATCH] Use global config for MQTT hosts

---
 group_vars/all.yaml                                    | 3 +++
 group_vars/mqtt_internal.yaml                          | 1 -
 roles/mqtt-internal/templates/public-bridge.conf       | 2 +-
 roles/music/templates/soundboard.yaml                  | 2 +-
 roles/photos/defaults/main.yaml                        | 2 +-
 roles/services/templates/discord-bot.service           | 2 +-
 roles/services/templates/irc-photos.sh                 | 2 +-
 roles/services/templates/mastodon-spacestate-config.py | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 group_vars/mqtt_internal.yaml

diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index 8f535da..99ceadd 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -13,3 +13,6 @@ trusted_ranges:
   - { v: ipv6, cidr: "fe80::/10" }
   - { v: ipv6, cidr: "2a02:166b:92::/64" }
 node_exporter: no
+
+mqtt_internal_host: mqtt.bitlair.nl
+mqtt_public_host: bitlair.nl
diff --git a/group_vars/mqtt_internal.yaml b/group_vars/mqtt_internal.yaml
deleted file mode 100644
index 3ce5308..0000000
--- a/group_vars/mqtt_internal.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mqtt_internal_public_host: bitlair.nl
diff --git a/roles/mqtt-internal/templates/public-bridge.conf b/roles/mqtt-internal/templates/public-bridge.conf
index 77d2557..a30bcab 100644
--- a/roles/mqtt-internal/templates/public-bridge.conf
+++ b/roles/mqtt-internal/templates/public-bridge.conf
@@ -1,7 +1,7 @@
 # Managed by Ansible
 
 connection public-bridge
-address {{ mqtt_internal_public_host }}
+address {{ mqtt_public_host }}
 
 topic bitlair/state out
 topic bitlair/state/djo out
diff --git a/roles/music/templates/soundboard.yaml b/roles/music/templates/soundboard.yaml
index 5ef917f..b253086 100644
--- a/roles/music/templates/soundboard.yaml
+++ b/roles/music/templates/soundboard.yaml
@@ -1,7 +1,7 @@
 loglevel: INFO
 
 mqtt:
-  host: mqtt.bitlair.nl
+  host: {{ mqtt_internal_host }}
 
 sounds:
   directory: /opt/sounds
diff --git a/roles/photos/defaults/main.yaml b/roles/photos/defaults/main.yaml
index b44f77d..88f66d6 100644
--- a/roles/photos/defaults/main.yaml
+++ b/roles/photos/defaults/main.yaml
@@ -1,3 +1,3 @@
-photos_mqtt_host: mqtt.bitlair.nl
+photos_mqtt_host: "{{ mqtt_internal_host }}"
 photos_mqtt_topic: bitlair/photos
 photos_path: /opt/wip
diff --git a/roles/services/templates/discord-bot.service b/roles/services/templates/discord-bot.service
index 9d3a3b7..f93dbc7 100644
--- a/roles/services/templates/discord-bot.service
+++ b/roles/services/templates/discord-bot.service
@@ -10,7 +10,7 @@ Restart=on-failure
 RestartSec=10s
 ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/main.py
 DynamicUser=true
-Environment="MQTT_HOST=bitlair.nl"
+Environment="MQTT_HOST={{ mqtt_internal_host }}"
 Environment="DISCORD_WEBHOOK_URL={{ discord_webhook_url }}"
 Environment="DISCORD_TOKEN={{ discord_token }}"
 
diff --git a/roles/services/templates/irc-photos.sh b/roles/services/templates/irc-photos.sh
index d41c348..a8d0911 100644
--- a/roles/services/templates/irc-photos.sh
+++ b/roles/services/templates/irc-photos.sh
@@ -5,7 +5,7 @@
 set -eu
 set -o pipefail
 
-mqtt-simple -h mqtt.bitlair.nl -s "bitlair/photos" |
+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"
diff --git a/roles/services/templates/mastodon-spacestate-config.py b/roles/services/templates/mastodon-spacestate-config.py
index fe30c15..1af7626 100644
--- a/roles/services/templates/mastodon-spacestate-config.py
+++ b/roles/services/templates/mastodon-spacestate-config.py
@@ -1,4 +1,4 @@
-mqtt_server = 'mqtt.bitlair.nl'
+mqtt_server = '{{ mqtt_internal_host }}'
 mqtt_port = 1883
 
 spacestate_topic = 'bitlair/state'