Fix typo, add minecraft and update commits

This commit is contained in:
Alex 2020-06-07 16:21:45 +02:00
parent 7673aac11f
commit 4eade00794
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
10 changed files with 94 additions and 5 deletions

3
.gitmodules vendored
View File

@ -88,3 +88,6 @@
[submodule "roles/homepage"]
path = roles/homepage
url = https://git.redxen.eu/RedXen/ansible-homepage
[submodule "roles/minecraft"]
path = roles/minecraft
url = https://git.redxen.eu/RedXen/ansible-minecraft

View File

@ -33,7 +33,9 @@
data:
uuid: '1245e7d9-1054-4e2f-816a-d38efbb47589'
influxdb:
storage: "/var/lib/influxdb"
data:
path: "/var/lib/influxdb"
uuid: "ac0740fe-abab-4bda-84ef-e39e0bd823b3"
port: "{{ global.backend.influxdb.port }}"
vault:
roles:
@ -41,6 +43,7 @@
mounts:
- { uuid: '{{ postgres.data.uuid }}', dest: '/var/lib/postgresql', state: 'mounted', fstype: 'ext4' }
- { uuid: '{{ redis.data.uuid }}', dest: '/var/lib/redis', state: 'mounted', fstype: 'ext4' }
- { uuid: '{{ influxdb.data.uuid }}', dest: '{{ influxdb.data.path }}', state: 'mounted', fstype: 'ext4' }
roles:
- vault
- mounts

View File

@ -8,6 +8,8 @@
- { port: "2442", ipv: "v6", proto: "tcp" }
- { port: "64738", ipv: "v4", proto: "tcp" }
- { port: "64738", ipv: "v6", proto: "tcp" }
- { port: "25565", ipv: "v4", proto: "tcp" }
- { port: "25565", ipv: "v6", proto: "tcp" }
apt:
packages:
- { package: "haproxy", state: present }
@ -32,7 +34,7 @@
tcp:
- {expose: 2442, proxy: 2443, group: "dev"} # Gitea SSH
- {expose: 64738, proxy: "{{ global.social.murmur.port }}", group: "social"} # Mumble
#- {expose: 25565, proxy: 25575, group: "minecraft"} # Minecraft
- {expose: 25565, proxy: "{{ global.games.minecraft.port }}", group: "games"} # Minecraft
redirect:
prefix:
- { pfx: "/web", acl: '{ hdr_beg(host) -i seed } { url / }' }

76
games.yml Normal file
View File

@ -0,0 +1,76 @@
---
- hosts: games
vars:
apt:
packages:
- { package: "openjdk-13-jre-headless", state: present }
systemd:
services:
- { name: "paper-server", enabled: true, state: restarted }
file:
- { path: "/etc/paper", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/worlds", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins/Essentials", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins/WorldGuard", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins/WorldGuard/worlds", owner: "nobody", group: "nogroup", mode: "760", state: directory }
- { path: "{{ minecraft.paths.data }}/plugins/WorldGuard/worlds/{{ minecraft.settings.levelname }}", 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 }
mounts:
- { uuid: 'adee3616-5461-4279-b587-fea73ba468a9', dest: '{{ minecraft.paths.data }}', state: 'mounted', fstype: 'xfs' }
minecraft:
paths:
data: "/mnt/minecraft"
plugins:
- { url: "https://rymatemc.co.uk/jenkins/job/bPermissions/184/artifact/bukkit/build/libs/bPermissions-Bukkit-2.12.4-all.jar", name: "bPermissions-Bukkit-2.12.4-all.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/Essentials/target/EssentialsX-2.17.2.112.jar", name: "EssentialsX.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/EssentialsAntiBuild/target/EssentialsXAntiBuild-2.17.2.112.jar", name: "EssentialsXAntiBuild.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/EssentialsChat/target/EssentialsXChat-2.17.2.112.jar", name: "EssentialsXChat.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/EssentialsGeoIP/target/EssentialsXGeoIP-2.17.2.112.jar", name: "EssentialsXGeoIP.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/EssentialsProtect/target/EssentialsXProtect-2.17.2.112.jar", name: "EssentialsXProtect.jar" }
- { url: "https://ci.ender.zone/job/EssentialsX/926/artifact/EssentialsSpawn/target/EssentialsXSpawn-2.17.2.112.jar", name: "EssentialsXSpawn.jar" }
configs:
- "server.properties"
- "ops.json"
- "server-icon.png"
- "whitelist.json"
- "plugins/bPermissions/config.yml"
- "plugins/Essentials/motd.txt"
- "plugins/bPermissions/global/groups.yml"
- "plugins/bPermissions/global/users.yml"
- "plugins/Essentials/config.yml"
- "plugins/WorldGuard/worlds/world/regions.yml" # Uses level_name but cannot be used because of "loops"
local_plugins:
- "plugins/worldguard-bukkit-7.0.2.jar"
- "plugins/worldedit-bukkit-7.1.0.jar"
- "plugins/Vault.jar"
listen:
ip: '{{ ansible_ens10.ipv4.address }}'
port: '{{ global.games.minecraft.port }}'
settings:
players: '24'
rcon:
enabled: "true"
port: 25575
password: "{{ vault_minecraft.rcon.password|default() }}"
motd: "\\u00A74\\u00A7l[RedXen]\\u00A7r \\u00A76Now more stable than ever on AMD Epyc\\u00A7r\\n\\u00A71Public server - hosted by \\u00A74redxen.eu"
whitelist: "false"
difficulty: "medium"
online: "true"
build_height: 256
view_distance: 12
level_name: "world"
gamemode: "survival"
pvp: "true"
spawn_protection: 32
vault:
roles:
- "minecraft"
roles:
- vault
- mounts
- apt
- file
- minecraft
- systemd

View File

@ -35,3 +35,6 @@ global:
grafana:
domain: "stats.redxen.eu"
port: 3000
games:
minecraft:
port: 25560

View File

@ -25,6 +25,7 @@
- "postgresql"
- "grafana"
- "telegraf"
- "minecraft"
- "gitea"
telegraf:
outputs:

@ -1 +1 @@
Subproject commit 70eb2a6e5730aa7188d1835b8b80e39549639e3d
Subproject commit 7ee3d6caf2736bce0c1c681f09ba0ffed0e20b80

1
roles/minecraft Submodule

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

@ -1 +1 @@
Subproject commit 2182ef94d9ed25bbbea62282f52d052a215eac9e
Subproject commit cdf0cbfcf2106cd9c3cc46ee3e1f4d6678432a45

View File

@ -10,7 +10,7 @@
systemd:
services:
- { name: "darkhttpd", enabled: true, action: restarted }
- { name: "transmission-daemon", enabled: true, action: reload }
- { name: "transmission-daemon", enabled: true, action: reloaded }
- { name: "sshd", enabled: true, action: reloaded }
overrides:
- "transmission-daemon"