From c074c944ab0cee0f3e3c214ee71c982341ac5ce1 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Sun, 10 May 2020 19:07:06 +0200
Subject: [PATCH] HAProxy ports as value, use A records, add httpd port, update
 commits

---
 group_vars/all  | 17 ++++++++++-------
 roles/database  |  2 +-
 roles/dns       |  2 +-
 roles/git       |  2 +-
 roles/seedbox   |  2 +-
 roles/wireguard |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/group_vars/all b/group_vars/all
index 165e350..bbb844f 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -1,8 +1,7 @@
 services:
         haproxy:
                 ports:
-                        https:
-                                - 443
+                        https: 443
                         tcp:
                                 - 2202  # Gitea SSH
                                 #- 64738 # Mumble
@@ -21,10 +20,10 @@ services:
                                         - {service: "seedown", port: 8082, group: "seedbox"}
                                         - {service: "transmission", port: 8081, group: "seedbox"}
                                         - {service: "grafana", port: 3000, group: "monitoring"}
-                                CNAME:
-                                        - {service: "postgres", host: "n0"}
-                                        - {service: "redis", host: "n0"}
-                                        - {service: "influxdb", host: "n0"}
+                                A: # Wish these would support SRV, would ease a lot of configuration management
+                                        - {service: "postgres", group: "database"}
+                                        - {service: "redis", group: "database"}
+                                        - {service: "influxdb", group: "database"}
                         remote:
                                 - {service: "homepage", port: "80", domain: "rxhome.s3-website.eu-central-1.amazonaws.com."}
         grafana:
@@ -42,6 +41,9 @@ services:
                 port: 
                         http: 3200
                         ssh: 2442
+                path:
+                        data: "/mnt/gitea" # TODO: Replace with device UUIDs
+                        config: "/etc/gitea"
         mumble:
                 configpath: '/etc/mumble-server.ini'
                 port: 6400
@@ -49,12 +51,13 @@ services:
                         host: "redxen.eu"
                         url: "redxen.eu"
         transmission:
-                root_dir: "/mnt/seedbox" # TODO: Use mount UUIDs
+                root_dir: "/mnt/seedbox" # TODO: Use device UUIDs
                 port:
                         peer: 51413
                         rpc: 8081
         darkhttpd:
                 path: "/etc/darkhttpd"
+                port: 8082
         influxdb:
                 port: 8086
         tor:
diff --git a/roles/database b/roles/database
index fcb4cc9..38763fd 160000
--- a/roles/database
+++ b/roles/database
@@ -1 +1 @@
-Subproject commit fcb4cc9dabb64f5558856fdbd77d9f23bfba6e88
+Subproject commit 38763fda084a6680ed1aece6bfd596b27d57b580
diff --git a/roles/dns b/roles/dns
index bdb4b20..7e4eba3 160000
--- a/roles/dns
+++ b/roles/dns
@@ -1 +1 @@
-Subproject commit bdb4b20d35058ae940c7e81e7244b47ecdf890d1
+Subproject commit 7e4eba3ac9525edfed9a69b0f16ea0f343a2491e
diff --git a/roles/git b/roles/git
index 8e906d9..3546d51 160000
--- a/roles/git
+++ b/roles/git
@@ -1 +1 @@
-Subproject commit 8e906d97e61ee05aa4ca49e6377bca9cac4552e2
+Subproject commit 3546d51d3174f55219b70a42581840fa8e9f2820
diff --git a/roles/seedbox b/roles/seedbox
index e9da76b..b89f037 160000
--- a/roles/seedbox
+++ b/roles/seedbox
@@ -1 +1 @@
-Subproject commit e9da76b3645b1297973f962fa81623354d9e5d28
+Subproject commit b89f03791ad0961832f4df486a3b97b51fbf1ab9
diff --git a/roles/wireguard b/roles/wireguard
index 6a30a73..9f2cd57 160000
--- a/roles/wireguard
+++ b/roles/wireguard
@@ -1 +1 @@
-Subproject commit 6a30a736fbfd76622871ffe58ba214815961612d
+Subproject commit 9f2cd5737e78287e6e5477f4b551feb7bc4134e3