Add deavmi proxy and terraria files

This commit is contained in:
Alex 2020-08-22 16:51:06 +02:00
parent 8d068e40b3
commit a18d49d836
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
7 changed files with 26 additions and 2 deletions

3
.gitmodules vendored
View File

@ -106,3 +106,6 @@
[submodule "roles/rspamd"] [submodule "roles/rspamd"]
path = roles/rspamd path = roles/rspamd
url = https://git.redxen.eu/RedXen/ansible-rspamd url = https://git.redxen.eu/RedXen/ansible-rspamd
[submodule "roles/terraria"]
path = roles/terraria
url = https://git.redxen.eu/RedXen/ansible-terraria

View File

@ -44,6 +44,7 @@
- { service: "grafana", port: "{{ global.monitoring.grafana.port }}", group: "monitoring" } - { service: "grafana", port: "{{ global.monitoring.grafana.port }}", group: "monitoring" }
- { service: "pleroma", port: "{{ global.social.pleroma.listen.port }}", group: "social" } - { service: "pleroma", port: "{{ global.social.pleroma.listen.port }}", group: "social" }
- { service: "homepage", port: "{{ global.homepage.port }}", group: "homepage" } - { 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 A: # Wish these would support SRV, would ease a lot of configuration management
- { service: "postgres", group: "backend" } - { service: "postgres", group: "backend" }
- { service: "redis", group: "backend" } - { service: "redis", group: "backend" }
@ -77,6 +78,7 @@
- { domain: "smtp.", group: "mail" } - { domain: "smtp.", group: "mail" }
- { domain: "imap.", group: "mail" } - { domain: "imap.", group: "mail" }
- { domain: "", group: "frontend" } - { domain: "", group: "frontend" }
- { domain: "deavmi-proxy.", group: "frontend" }
roles: roles:
#- file #- file
- apt - apt

View File

@ -46,6 +46,7 @@
- {domain: "sd", count: 1, service: "seedown", httpchk: true} - {domain: "sd", count: 1, service: "seedown", httpchk: true}
- {domain: "social", count: 1, service: "pleroma", httpchk: true} - {domain: "social", count: 1, service: "pleroma", httpchk: true}
- {domain: "root", count: 1, service: "homepage", httpchk: true} # Homepage - {domain: "root", count: 1, service: "homepage", httpchk: true} # Homepage
- {domain: "deavmi-proxy", count: 1, service: "deavmi-proxy", httpchk: true} # Homepage
varnish: varnish:
backend: backend:
sock: '{{ haproxy.socketroot }}/haproxy.sock' sock: '{{ haproxy.socketroot }}/haproxy.sock'

View File

@ -4,10 +4,13 @@
apt: apt:
packages: packages:
- { package: "openjdk-13-jre-headless", state: present } - { package: "openjdk-13-jre-headless", state: present }
- { package: "unzip", state: present }
- { package: "mono-complete", state: present }
systemd: systemd:
services: services:
- { name: "paper-server", enabled: true, action: restarted } - { name: "paper-server", enabled: true, action: restarted }
- { name: "factorio", enabled: true, action: restarted } - { name: "factorio", enabled: true, action: restarted }
- { name: "tshock", enabled: true, action: restarted }
file: file:
- { path: "/etc/paper", owner: "nobody", group: "nogroup", mode: "760", state: directory } - { path: "/etc/paper", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "/etc/factorio", 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/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", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins/bPermissions/global", 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: mounts:
- { uuid: 'adee3616-5461-4279-b587-fea73ba468a9', dest: '{{ minecraft.paths.data }}', state: 'mounted', fstype: 'xfs' } - { 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: '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: factorio:
paths: paths:
data: "/mnt/factorio" data: "/mnt/factorio"
bind: bind:
address: "0.0.0.0" address: "0.0.0.0"
port: "{{ global.games.factorio.port }}" port: "{{ global.games.factorio.port }}"
terraria:
world: "Main"
bind:
port: "7777"
paths:
data: "/mnt/terraria"
configs:
- "config.json"
- "sscconfig.json"
minecraft: minecraft:
paths: paths:
data: "/mnt/minecraft" data: "/mnt/minecraft"
@ -82,6 +96,8 @@
firewall: firewall:
- { port: "{{ factorio.bind.port }}", ipv: "v4", proto: "udp" } - { port: "{{ factorio.bind.port }}", ipv: "v4", proto: "udp" }
- { port: "{{ factorio.bind.port }}", ipv: "v6", 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: roles:
- vault - vault
- mounts - mounts
@ -89,5 +105,6 @@
- file - file
- factorio - factorio
- minecraft - minecraft
- terraria
- systemd - systemd
- firewall - firewall

@ -1 +1 @@
Subproject commit 5d7f2b0f4cf16f71c0469bb33e87998f7056e9c0 Subproject commit 44601962cab569b08b0dfd1247923639427af936

@ -1 +1 @@
Subproject commit 37123d9e0ebcb399d13c8095f03051a9a29d322d Subproject commit a573a5860cf2353947677c147725c844b966a149

1
roles/terraria Submodule

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