Update repos and use global env, add ircd

2020-05-09 18:04:43 +02:00 · 2020-05-09 18:04:43 +02:00 · 1a4815b496
parent 140223ee02
commit 1a4815b496
19 changed files with 108 additions and 15 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -34,3 +34,6 @@
 [submodule "roles/seedbox"]
 	path = roles/seedbox
 	url = https://git.redxen.eu/RedXen/ansible-seedbox
+[submodule "roles/ircd"]
+	path = roles/ircd
+	url = https://git.redxen.eu/RedXen/ircd-ansible
--- a/git.yml
+++ b/git.yml
@ -1,7 +1,6 @@
 ---
 - hosts: git
  vars_files:
-        - '{{ role_path }}/vars/domains.yml'
        - '{{ role_path }}/vars/database.yml'
        - '{{ role_path }}/vault/keys.yml'
  roles:
--- a/group_vars/all
+++ b/group_vars/all
@ -0,0 +1,87 @@
+services:
+        haproxy:
+                ports:
+                        https:
+                                - 443
+                        tcp:
+                                - 2202  # Gitea SSH
+                                #- 64738 # Mumble
+                                #- 25565 # Minecraft 
+                public:
+                        # These are load balanced, it doesn't matter what IP they point to
+                        - {domain: "dev-stats", service: "grafana", httpchk: true}
+                        - {domain: "dev-gitea", service: "gitea", httpchk: true}
+                        - {domain: "dev-transmission", service: "transmission", httpchk: false}
+                        - {domain: "dev-sd", service: "seedown", httpchk: true}
+        unbound:
+                internal:
+                        local:
+                                SRV:
+                                        - {service: "gitea", port: 3200, group: "git"}
+                                        - {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"}
+                        remote:
+                                - {service: "homepage", port: "80", domain: "rxhome.s3-website.eu-central-1.amazonaws.com."}
+        grafana:
+                domain: "dev-stats.redxen.eu"
+                port: 3000
+        postgres:
+                host: "postgres.redxen.localhost"
+                port: 5432
+        redis:
+                host: "redis.redxen.localhost"
+                port: 6379
+        gitea:
+                user: "git"
+                domain: "dev-gitea.redxen.eu"
+                port: 
+                        http: 3200
+                        ssh: 2442
+        mumble:
+                configpath: '/etc/mumble-server.ini'
+                port: 6400
+                register:
+                        host: "redxen.eu"
+                        url: "redxen.eu"
+        transmission:
+                root_dir: "/mnt/seedbox" # TODO: Use mount UUIDs
+                port:
+                        peer: 51413
+                        rpc: 8081
+        darkhttpd:
+                path: "/etc/darkhttpd"
+        influxdb:
+                port: 8086
+        tor:
+                listen:
+                        socks:
+                                addr: "127.0.0.1"
+                                port: 9050
+                        http:
+                                addr: "127.0.0.1"
+                                port: 7050
+        wireguard:
+                interface: 'wg0'
+                port: 51820
+                net:
+                        v4:
+                                addr: "172.22.12"
+                                range:
+                                        serv: 24
+                                        clnt: 32
+                        v6:
+                                addr: "fd86:ea04:1115:"
+                                range:
+                                        serv: 120
+                                        clnt: 128
+                peers:
+                        - { bit: 2, pubkey: "Xb+ASR5NdnIB+dXWEA4H0V3d0LC0KocKeFeQDyqDqjk=" }
+                        - { bit: 3, pubkey: "kz9vLMnPtfka11n1EJpzHb4966ieJSo4BU1P2joHLXo=" }
+                        - { bit: 10, pubkey: "wpjMlhrcv173ER7rZ0KrmaqahcqZA/fm3ovpaGlRIRo=" }
+                        - { bit: 12, pubkey: "2FRcncz/oSmqFQLrHqICi4fEkgxrCeS9P8TTv5gcfCw=" }
+                        - { bit: 14, pubkey: "XYUXzDDXzo1uDadvJ8YW5X/ISCZSyu10d35i7mb0pAY=" }
--- a/ircd.yml
+++ b/ircd.yml
@ -0,0 +1,4 @@
+---
+- hosts: ircd
+  roles:
+          - ircd
--- a/monitoring.yml
+++ b/monitoring.yml
@ -2,7 +2,6 @@
 - hosts: monitoring
  vars_files:
        - '{{ role_path }}/vars/database.yml'
-        - '{{ role_path }}/vars/domains.yml'
        - '{{ role_path }}/vault/keys.yml'
  roles:
        - monitoring
--- a/pleroma.yml
+++ b/pleroma.yml
@ -1,7 +1,6 @@
 ---
 - hosts: pleroma
  vars_files:
-        - '{{ role_path }}/vars/domains.yml'
        - '{{ role_path }}/vars/database.yml'
        - '{{ role_path }}/vault/keys.yml'
  roles:
--- a/3
+++ b/3
@ -29,3 +29,6 @@ n0

 [seedbox]
 n0
+
+[pleroma]
+n0
--- a/roles/database
+++ b/roles/database
@ -1 +1 @@
-Subproject commit 8dff1d0d33d3369b83b703879c2478e586a06124
+Subproject commit fcb4cc9dabb64f5558856fdbd77d9f23bfba6e88
--- a/roles/dns
+++ b/roles/dns
@ -1 +1 @@
-Subproject commit b33fa00c7674e3fcb005923b9947b6e3dbf69e53
+Subproject commit bdb4b20d35058ae940c7e81e7244b47ecdf890d1
--- a/roles/git
+++ b/roles/git
@ -1 +1 @@
-Subproject commit 5982eba06b0c200ff7e22ce641d366650696cf97
+Subproject commit 8e906d97e61ee05aa4ca49e6377bca9cac4552e2
--- a/roles/ircd
+++ b/roles/ircd
@ -0,0 +1 @@
+Subproject commit 15d48d1b6226b68115283ed764868c80a5a77807
--- a/roles/monitoring
+++ b/roles/monitoring
@ -1 +1 @@
-Subproject commit ba6610e22a91835a866dd60681dff3d1da6b1a61
+Subproject commit 4c58df3060479b809f2518bf2346c8150f97b1f7
--- a/roles/mumble
+++ b/roles/mumble
@ -1 +1 @@
-Subproject commit 75fd4036c995531ff5bbc62f05277f36e451d733
+Subproject commit 0548bb0340bdb13fcf94da8e603faae09da8b84b
--- a/roles/pleroma
+++ b/roles/pleroma
@ -1 +1 @@
-Subproject commit 992e072228c943131e257dfaabd913398a34e1f4
+Subproject commit 601f4041a0ba471604f9d6ee9329dfb934f10968
--- a/roles/seedbox
+++ b/roles/seedbox
@ -1 +1 @@
-Subproject commit 2591c7b3b616a36888a87aec2727794cf9b39c8e
+Subproject commit e9da76b3645b1297973f962fa81623354d9e5d28
--- a/roles/tor
+++ b/roles/tor
@ -1 +1 @@
-Subproject commit 63873d89d13c6df9aa4fec9d2e94e604b4bc4b0f
+Subproject commit ecc6fc928de5ada2564f3be2187d4bc7db9857b9
--- a/roles/web
+++ b/roles/web
@ -1 +1 @@
-Subproject commit b5568de7c5bda3f0965e9ddedaf71fb4a31dadd8
+Subproject commit be37b988c474a852c1d4f8d58f9ab09497873636
--- a/roles/wireguard
+++ b/roles/wireguard
@ -1 +1 @@
-Subproject commit 0cd5cb1cf8c9d1da13a7826678626c6c8d9254c7
+Subproject commit 6a30a736fbfd76622871ffe58ba214815961612d
--- a/web.yml
+++ b/web.yml
@ -1,6 +1,4 @@
 ---
 - hosts: web
-  vars_files:
-        - '{{ role_path }}/vars/domains.yml'
  roles:
        - web
				`@ -0,0 +1 @@`
				`Subproject commit 15d48d1b6226b68115283ed764868c80a5a77807`