HAProxy ports as value, use A records, add httpd port, update commits

2020-05-10 19:07:06 +02:00 · 2020-05-10 19:07:06 +02:00 · c074c944ab
commit c074c944ab
parent a4cd635b2e
6 changed files with 15 additions and 12 deletions
--- 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:
--- a/roles/database
+++ b/roles/database
@ -1 +1 @@
-Subproject commit fcb4cc9dabb64f5558856fdbd77d9f23bfba6e88
+Subproject commit 38763fda084a6680ed1aece6bfd596b27d57b580
--- a/roles/dns
+++ b/roles/dns
@ -1 +1 @@
-Subproject commit bdb4b20d35058ae940c7e81e7244b47ecdf890d1
+Subproject commit 7e4eba3ac9525edfed9a69b0f16ea0f343a2491e
--- a/roles/git
+++ b/roles/git
@ -1 +1 @@
-Subproject commit 8e906d97e61ee05aa4ca49e6377bca9cac4552e2
+Subproject commit 3546d51d3174f55219b70a42581840fa8e9f2820
--- a/roles/seedbox
+++ b/roles/seedbox
@ -1 +1 @@
-Subproject commit e9da76b3645b1297973f962fa81623354d9e5d28
+Subproject commit b89f03791ad0961832f4df486a3b97b51fbf1ab9
--- a/roles/wireguard
+++ b/roles/wireguard
@ -1 +1 @@
-Subproject commit 6a30a736fbfd76622871ffe58ba214815961612d
+Subproject commit 9f2cd5737e78287e6e5477f4b551feb7bc4134e3