From 69dbb6dd8dc9c31d0009d9c50547970dabe5eeef Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 4 Nov 2023 23:28:23 +0100
Subject: [PATCH] Fixes for baldur

---
 inventory/host_vars/baldur/vars.yml    | 18 +++++++++++++++---
 inventory/host_vars/yggdrasil/vars.yml |  2 --
 playbooks/baldur.yml                   |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/inventory/host_vars/baldur/vars.yml b/inventory/host_vars/baldur/vars.yml
index 878c9f3..e355866 100644
--- a/inventory/host_vars/baldur/vars.yml
+++ b/inventory/host_vars/baldur/vars.yml
@@ -56,12 +56,24 @@ services_host_services:
     collection_path: "{{ music_user_data_collection_directory }}"
     archive_path: "{{ music_user_data_archive_directory }}"
     restic: true
-  rproxy:
+  metrics:
     inet_address: "{{ vpn_bridge_inet_prefix }}.8"
     inet6_address: "{{ vpn_bridge_inet6_prefix }}::8"
+    target_inet: "{{ vpn_wireguard_inet6_address }}"
+    target_inet6: "{{ vpn_wireguard_inet6_address }}"
+    target_port: 19999
+    tcp: [9090]
+    restic: true
+  dash:
+    inet_address: "{{ vpn_bridge_inet_prefix }}.9"
+    inet6_address: "{{ vpn_bridge_inet6_prefix }}::9"
+    restic: true
+  rproxy:
+    inet_address: "{{ vpn_bridge_inet_prefix }}.10"
+    inet6_address: "{{ vpn_bridge_inet6_prefix }}::10"
     tcp: [80, 443]
     restic: true
   www:
-    inet_address: "{{ vpn_bridge_inet_prefix }}.9"
-    inet6_address: "{{ vpn_bridge_inet6_prefix }}::9"
+    inet_address: "{{ vpn_bridge_inet_prefix }}.11"
+    inet6_address: "{{ vpn_bridge_inet6_prefix }}::11"
     restic: false
diff --git a/inventory/host_vars/yggdrasil/vars.yml b/inventory/host_vars/yggdrasil/vars.yml
index ee285de..f6a1e5a 100644
--- a/inventory/host_vars/yggdrasil/vars.yml
+++ b/inventory/host_vars/yggdrasil/vars.yml
@@ -38,8 +38,6 @@ system_base_additional_tcp_ports:
   - 139                         # samba
   - 445                         # samba
   - 19999                       # netdata
-system_base_forward_to_localhost:
-  - 19999                       # netdata
 system_base_unattended_upgrades_blacklist:
   - "linux-"
   - "zfs(utils)?-"
diff --git a/playbooks/baldur.yml b/playbooks/baldur.yml
index 2d72fbc..7bced01 100644
--- a/playbooks/baldur.yml
+++ b/playbooks/baldur.yml
@@ -160,6 +160,7 @@
         services_deploy_rproxy_nginx_subdomain_config_files:
           - "files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf"
+          - "files/services/deploy/lrproxy/nginx-conf.d/dash.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/database.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf"