Update new stuff, i am not writing the fuckton of changes here

.gitmodules

@@ -1,39 +1,36 @@
-[submodule "roles/database"]
+[submodule "roles/unbound"]
-	path = roles/database
+	path = roles/unbound
-	url = https://git.redxen.eu/RedXen/ansible-database
+	url = https://git.redxen.eu/RedXen/ansible-unbound
-[submodule "roles/common"]
+[submodule "roles/haproxy"]
-	path = roles/common
+	path = roles/haproxy
-	url = https://git.redxen.eu/RedXen/ansible-common
+	url = https://git.redxen.eu/RedXen/ansible-haproxy
-[submodule "roles/dns"]
-	path = roles/dns
-	url = https://git.redxen.eu/RedXen/ansible-dns
-[submodule "roles/web"]
-	path = roles/web
-	url = https://git.redxen.eu/RedXen/ansible-web
-[submodule "roles/monitoring"]
-	path = roles/monitoring
-	url = https://git.redxen.eu/RedXen/ansible-monitoring
-[submodule "roles/git"]
-	path = roles/git
-	url = https://git.redxen.eu/RedXen/ansible-git
-[submodule "roles/mumble"]
-	path = roles/mumble
-	url = https://git.redxen.eu/RedXen/ansible-mumble
 [submodule "roles/wireguard"]
 	path = roles/wireguard
 	url = https://git.redxen.eu/RedXen/ansible-wireguard
+[submodule "roles/apt"]
+	path = roles/apt
+	url = https://git.redxen.eu/RedXen/ansible-apt
+[submodule "roles/file"]
+	path = roles/file
+	url = https://git.redxen.eu/RedXen/ansible-file
+[submodule "roles/firewall"]
+	path = roles/firewall
+	url = https://git.redxen.eu/RedXen/ansible-firewall
+[submodule "roles/systemd"]
+	path = roles/systemd
+	url = https://git.redxen.eu/RedXen/ansible-systemd
+[submodule "roles/vault"]
+	path = roles/vault
+	url = https://git.redxen.eu/RedXen/ansible-vault
 [submodule "roles/tor"]
 	path = roles/tor
 	url = https://git.redxen.eu/RedXen/ansible-tor
-[submodule "roles/minecraft"]
+[submodule "roles/postgresql"]
-	path = roles/minecraft
+	path = roles/postgresql
-	url = https://git.redxen.eu/RedXen/ansible-minecraft
+	url = https://git.redxen.eu/RedXen/ansible-postgresql
-[submodule "roles/pleroma"]
+[submodule "roles/redis"]
-	path = roles/pleroma
+	path = roles/redis
-	url = https://git.redxen.eu/RedXen/ansible-pleroma
+	url = https://git.redxen.eu/RedXen/ansible-redis
-[submodule "roles/seedbox"]
+[submodule "roles/influxdb"]
-	path = roles/seedbox
+	path = roles/influxdb
-	url = https://git.redxen.eu/RedXen/ansible-seedbox
+	url = https://git.redxen.eu/RedXen/ansible-influxdb
-[submodule "roles/ircd"]
-	path = roles/ircd
-	url = https://git.redxen.eu/RedXen/ansible-ircd

ansible.cfg

@@ -3,3 +3,4 @@ gathering = smart
 fact_caching = jsonfile
 fact_caching_connection = ~/.ansible-fax
 fact_caching_timeout = 86400
+hash_behavior=merge

backend.yml

@@ -0,0 +1,22 @@
+---
+- hosts: backend
+  vars:
+        apt_packages:
+                - { package: "postgresql", state: present }
+                - { package: "python3-psycopg2", state: present }
+                - { package: "redis", state: present }
+                - { package: "influxdb", state: present }
+        systemd:
+                services:
+                        - { name: "postgres@12-main", enabled: true, action: reloaded }
+                        - { name: "redis", enabled: true, action: restarted }
+                        - { name: "influxdb", enabled: true, action: restarted }
+                overrides:
+                        - "influxdb"
+  roles:
+        - vault
+        - apt
+        - postgresql
+        - influxdb
+        - redis
+        - systemd

common.yml

@@ -1,4 +0,0 @@
----
-- hosts: all
-  roles:
-        - common

database.yml

@@ -1,4 +0,0 @@
----
-- hosts: database
-  roles:
-        - database

dns.yml

@@ -1,4 +1,7 @@
 ---
 - hosts: dns
   roles:
-        - dns
+        - apt
+        - unbound
+        - systemd
+        - firewall

frontend.yml

@@ -0,0 +1,6 @@
+---
+- hosts: frontend
+  roles:
+        - apt
+        - haproxy
+        - systemd

git.yml

@@ -1,4 +0,0 @@
----
-- hosts: git
-  roles:
-        - git

group_vars/all

@@ -32,6 +32,11 @@ services:
         postgres:
                 host: "postgres.redxen.localhost"
                 port: 5432
+                databases:
+                        - grafana
+                        - pleroma
+                        - gitea
+                        - murmur
         redis:
                 host: "redis.redxen.localhost"
                 port: 6379

ircd.yml

@@ -1,4 +0,0 @@
----
-- hosts: ircd
-  roles:
-        - ircd

minecraft.yml

@@ -1,4 +0,0 @@
----
-- hosts: minecraft
-  roles:
-        - minecraft

monitoring.yml

@@ -1,4 +0,0 @@
----
-- hosts: monitoring
-  roles:
-        - monitoring

mumble.yml

@@ -1,4 +0,0 @@
----
-- hosts: mumble
-  roles:
-        - mumble

net.yml

@@ -0,0 +1,25 @@
+---
+- hosts: net
+  vars:
+        file:
+                - { path: '/etc/tor', owner: 'root', group: 'root', mode: '600', state: directory }
+                - { path: '/etc/wireguard', owner: 'root', group: 'root', mode: '600', state: directory }
+        apt_packages:
+                - { package: "tor", state: present }
+                - { package: "wireguard-tools", state: present }
+                - { package: "wireguard", state: present }
+        systemd:
+                services:
+                        - { name: "tor@default", enabled: true, action: restarted }
+                        - { name: "wg-quick@wg0", enabled: true, action: restarted }
+        firewall:
+                - { port: "{{ services.wireguard.port }}", ipv: "v4", proto: "tcp" }
+                - { port: "{{ services.wireguard.port }}", ipv: "v6", proto: "tcp" }
+  roles:
+        - vault
+        - file
+        - apt
+        - wireguard
+        - tor
+        - systemd
+        - firewall

pleroma.yml

@@ -1,4 +0,0 @@
----
-- hosts: pleroma
-  roles:
-        - pleroma

production

@@ -1,11 +1,11 @@
 n0
 n1
 
-[web]
+[frontend]
 n0
 n1
 
-[database]
+[backend]
 n0
 
 [monitoring]
@@ -15,24 +15,17 @@ n0
 n0
 n1
 
-[git]
+[dev]
 n0
 
-[mumble]
+[net]
-n0
-n1
-
-[wireguard]
 n0
 
-[tor]
+[games]
-n0
-
-[minecraft]
 n0
 
 [seedbox]
 n0
 
-[pleroma]
+[social]
 n0

roles/common

@@ -1 +0,0 @@
-Subproject commit 42561893f32b7c9cfcdcaacb50202badb4207b58

roles/database

@@ -1 +0,0 @@
-Subproject commit c724c33058fa856ad39a5c547147bad8f69328ae

roles/dns

@@ -1 +0,0 @@
-Subproject commit 7e4eba3ac9525edfed9a69b0f16ea0f343a2491e

roles/git

@@ -1 +0,0 @@
-Subproject commit 8138afd23714239c283d7ec7dbe3d1932084125a

roles/ircd

@@ -1 +0,0 @@
-Subproject commit 15d48d1b6226b68115283ed764868c80a5a77807

roles/minecraft

@@ -1 +0,0 @@
-Subproject commit cd9b29238316025b7f059b81a9abe319932f37d0

roles/monitoring

@@ -1 +0,0 @@
-Subproject commit c7b5c388b81fde50ba2b6fc96b1e24344dd71dee

roles/mumble

@@ -1 +0,0 @@
-Subproject commit fb85a1d3fc0d0e3fb321620da1b599cca48aa344

roles/pleroma

@@ -1 +0,0 @@
-Subproject commit 601f4041a0ba471604f9d6ee9329dfb934f10968

roles/seedbox

@@ -1 +0,0 @@
-Subproject commit cb39925ad6cb4d5d85e8b175766a9e6b3142a073

roles/tor

@@ -1 +0,0 @@
-Subproject commit ecc6fc928de5ada2564f3be2187d4bc7db9857b9

roles/web

@@ -1 +0,0 @@
-Subproject commit be37b988c474a852c1d4f8d58f9ab09497873636

roles/wireguard

@@ -1 +0,0 @@
-Subproject commit 01d272f0522d01f681c0180ffa0a80322a91d302

seedbox.yml

@@ -1,4 +0,0 @@
----
-- hosts: seedbox
-  roles:
-        - seedbox

tor.yml

@@ -1,4 +0,0 @@
----
-- hosts: tor
-  roles:
-        - tor

web.yml

@@ -1,4 +0,0 @@
----
-- hosts: web
-  roles:
-        - web

wireguard.yml

@@ -1,4 +0,0 @@
----
-- hosts: wireguard
-  roles:
-        - wireguard