From a18d49d8365e1490695c2a4f266c0b01a54a95f9 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Sat, 22 Aug 2020 16:51:06 +0200
Subject: [PATCH] Add deavmi proxy and terraria files

---
 .gitmodules    |  3 +++
 dns.yml        |  2 ++
 frontend.yml   |  1 +
 games.yml      | 17 +++++++++++++++++
 roles/dovecot  |  2 +-
 roles/postfix  |  2 +-
 roles/terraria |  1 +
 7 files changed, 26 insertions(+), 2 deletions(-)
 create mode 160000 roles/terraria

diff --git a/.gitmodules b/.gitmodules
index 0c97850..165f2fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,6 @@
 [submodule "roles/rspamd"]
 	path = roles/rspamd
 	url = https://git.redxen.eu/RedXen/ansible-rspamd
+[submodule "roles/terraria"]
+	path = roles/terraria
+	url = https://git.redxen.eu/RedXen/ansible-terraria
diff --git a/dns.yml b/dns.yml
index f605b47..42d1f61 100644
--- a/dns.yml
+++ b/dns.yml
@@ -44,6 +44,7 @@
                                         - { service: "grafana", port: "{{ global.monitoring.grafana.port }}", group: "monitoring" }
                                         - { service: "pleroma", port: "{{ global.social.pleroma.listen.port }}", group: "social" }
                                         - { service: "homepage", port: "{{ global.homepage.port }}", group: "homepage" }
+                                        - { service: "deavmi-proxy", port: "80", rawhost: "deavmi.assigned.network" }
                                 A: # Wish these would support SRV, would ease a lot of configuration management
                                         - { service: "postgres", group: "backend" }
                                         - { service: "redis", group: "backend" }
@@ -77,6 +78,7 @@
                                         - { domain: "smtp.", group: "mail" }
                                         - { domain: "imap.", group: "mail" }
                                         - { domain: "", group: "frontend" }
+                                        - { domain: "deavmi-proxy.", group: "frontend" }
   roles:
         #- file
         - apt
diff --git a/frontend.yml b/frontend.yml
index 7d0b54f..dbc30ae 100644
--- a/frontend.yml
+++ b/frontend.yml
@@ -46,6 +46,7 @@
                         - {domain: "sd", count: 1, service: "seedown", httpchk: true}
                         - {domain: "social", count: 1, service: "pleroma", httpchk: true}
                         - {domain: "root", count: 1, service: "homepage", httpchk: true} # Homepage
+                        - {domain: "deavmi-proxy", count: 1, service: "deavmi-proxy", httpchk: true} # Homepage
         varnish:
                 backend:
                         sock: '{{ haproxy.socketroot }}/haproxy.sock'
diff --git a/games.yml b/games.yml
index a6a15b0..7bafce5 100644
--- a/games.yml
+++ b/games.yml
@@ -4,10 +4,13 @@
         apt:
                 packages:
                         - { package: "openjdk-13-jre-headless", state: present }
+                        - { package: "unzip", state: present }
+                        - { package: "mono-complete", state: present }
         systemd:
                 services:
                         - { name: "paper-server", enabled: true, action: restarted }
                         - { name: "factorio", enabled: true, action: restarted }
+                        - { name: "tshock", enabled: true, action: restarted }
         file:
                 - { path: "/etc/paper", owner: "nobody", group: "nogroup", mode: "760", state: directory }
                 - { path: "/etc/factorio", owner: "nobody", group: "nogroup", mode: "760", state: directory }
@@ -20,15 +23,26 @@
                 - { path: "{{ minecraft.paths.data }}/plugins/WorldGuard/worlds/{{ minecraft.settings.level_name }}", owner: "nobody", group: "nogroup", mode: "760", state: directory }
                 - { path: "{{ minecraft.paths.data }}/plugins/bPermissions", owner: "nobody", group: "nogroup", mode: "760", state: directory }
                 - { path: "{{ minecraft.paths.data }}/plugins/bPermissions/global", owner: "nobody", group: "nogroup", mode: "760", state: directory }
+                - { path: "/opt/terraria", owner: "nobody", group: "nogroup", mode: "760", state: directory }
         mounts:
                 - { uuid: 'adee3616-5461-4279-b587-fea73ba468a9', dest: '{{ minecraft.paths.data }}', state: 'mounted', fstype: 'xfs' }
                 - { uuid: '652d7dff-ca35-418d-b6dc-f50814adccba', dest: '{{ factorio.paths.data }}', state: 'mounted', fstype: 'xfs' }
+                - { uuid: 'a6df145a-42f3-41a3-8135-4c16b3692db1', dest: '{{ terraria.paths.data }}', state: 'mounted', fstype: 'xfs' }
         factorio:
                 paths:
                         data: "/mnt/factorio"
                 bind:
                         address: "0.0.0.0"
                         port: "{{ global.games.factorio.port }}"
+        terraria:
+                world: "Main"
+                bind:
+                        port: "7777"
+                paths:
+                        data: "/mnt/terraria"
+                configs:
+                        - "config.json"
+                        - "sscconfig.json"
         minecraft:
                 paths:
                         data: "/mnt/minecraft"
@@ -82,6 +96,8 @@
         firewall:
                 - { port: "{{ factorio.bind.port }}", ipv: "v4", proto: "udp" }
                 - { port: "{{ factorio.bind.port }}", ipv: "v6", proto: "udp" }
+                - { port: "{{ terraria.bind.port }}", ipv: "v4", proto: "tcp" }
+                - { port: "{{ terraria.bind.port }}", ipv: "v6", proto: "tcp" }
   roles:
         - vault
         - mounts
@@ -89,5 +105,6 @@
         - file
         - factorio
         - minecraft
+        - terraria
         - systemd
         - firewall
diff --git a/roles/dovecot b/roles/dovecot
index 5d7f2b0..4460196 160000
--- a/roles/dovecot
+++ b/roles/dovecot
@@ -1 +1 @@
-Subproject commit 5d7f2b0f4cf16f71c0469bb33e87998f7056e9c0
+Subproject commit 44601962cab569b08b0dfd1247923639427af936
diff --git a/roles/postfix b/roles/postfix
index 37123d9..a573a58 160000
--- a/roles/postfix
+++ b/roles/postfix
@@ -1 +1 @@
-Subproject commit 37123d9e0ebcb399d13c8095f03051a9a29d322d
+Subproject commit a573a5860cf2353947677c147725c844b966a149
diff --git a/roles/terraria b/roles/terraria
new file mode 160000
index 0000000..ac99940
--- /dev/null
+++ b/roles/terraria
@@ -0,0 +1 @@
+Subproject commit ac99940e17b8ae4b5efff08e7a3437f851a011be