From 340da1926e5545ad87321c934e68d7e2cb31e297 Mon Sep 17 00:00:00 2001 From: Salt Date: Sat, 7 Aug 2021 12:08:29 -0500 Subject: [PATCH] Move gameservers into task files --- playbooks/game.yml | 170 ++---------------- .../tasks/game/botaniapack2-creative.yml | 24 +++ .../tasks/game/botaniapack2-survival.yml | 24 +++ playbooks/tasks/game/css.yml | 19 ++ playbooks/tasks/game/gmod.yml | 25 +++ playbooks/tasks/game/scpsl.yml | 18 ++ playbooks/tasks/game/starbound.yml | 15 ++ playbooks/tasks/game/terraria.yml | 14 ++ playbooks/tasks/game/valhelsia3.yml | 23 +++ playbooks/vars/desultd-pleroma-apache.yml | 20 --- playbooks/vars/desultd-pleroma-certbot.yml | 10 -- playbooks/vars/desultd-pleroma.yml | 16 -- playbooks/vars/factorio-main.yml | 13 -- 13 files changed, 178 insertions(+), 213 deletions(-) create mode 100644 playbooks/tasks/game/botaniapack2-creative.yml create mode 100644 playbooks/tasks/game/botaniapack2-survival.yml create mode 100644 playbooks/tasks/game/css.yml create mode 100644 playbooks/tasks/game/gmod.yml create mode 100644 playbooks/tasks/game/scpsl.yml create mode 100644 playbooks/tasks/game/starbound.yml create mode 100644 playbooks/tasks/game/terraria.yml create mode 100644 playbooks/tasks/game/valhelsia3.yml delete mode 100644 playbooks/vars/desultd-pleroma-apache.yml delete mode 100644 playbooks/vars/desultd-pleroma-certbot.yml delete mode 100644 playbooks/vars/desultd-pleroma.yml delete mode 100644 playbooks/vars/factorio-main.yml diff --git a/playbooks/game.yml b/playbooks/game.yml index 1f6d114..49b9da8 100755 --- a/playbooks/game.yml +++ b/playbooks/game.yml @@ -20,159 +20,21 @@ tags: [ docker, skip-pull ] - hosts: game1.desu.ltd tasks: - - name: docker deploy gmod - docker_container: - name: gmod - state: started - image: hackebein/garrysmod - restart_policy: unless-stopped - pull: yes - tty: yes - env: - AUTHKEY: "{{ steam_apikey }}" - GAMEMODE: prop_hunt - MAP: ph_islandhouse - WORKSHOP: "2155532035" - WORKSHOPDL: "2155532035" - ports: - - "1200:1200" - - "26901:26901/udp" - - "27005:27005/udp" - - "27015:27015" - - "27015:27015/udp" - - "27020:27020/udp" - volumes: - - /data/gmod:/opt/overlay - tags: [ docker, gmod ] - - name: docker deploy starbound - docker_container: - name: starbound - state: absent - image: didstopia/starbound-server - restart_policy: unless-stopped - pull: yes - env: - SKIP_STEAMCMD: "true" - ports: - - "21025:21025" - volumes: - - /data/starbound/main:/steamcmd/starbound - tags: [ docker, starbound ] - - name: docker deploy minecraft botaniapack2-survival - docker_container: - name: botaniapack2-survival - state: started - image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 - restart_policy: unless-stopped - pull: yes - env: - TZ: "America/Chicago" - ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" - JRE_XMX: 5G - JRE_XMS: 3G - FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-botaniapack2/latest.zip" - ports: - - "25565:25565/tcp" - - "25565:25565/udp" - volumes: - - /data/minecraft/botaniapack2-survival/backups:/minecraft/backups - - /data/minecraft/botaniapack2-survival/logs:/minecraft/logs - - /data/minecraft/botaniapack2-survival/world:/minecraft/world - - /data/minecraft/botaniapack2-survival/ops.json:/minecraft/ops.json - - /data/minecraft/botaniapack2-survival/server.properties:/minecraft/server.properties - tags: [ docker, minecraft, botania, survival ] - - name: docker deploy minecraft valhelsia3 - docker_container: - name: valhelsia3 - state: absent - image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 - restart_policy: unless-stopped - pull: yes - env: - TZ: "America/Chicago" - ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" - JRE_XMX: 5G - JRE_XMS: 2G - FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-valhelsia/server.zip" - ports: - - "25565:25565/tcp" - - "25565:25565/udp" - volumes: - - /data/minecraft/valhelsia3/backups:/minecraft/backups - - /data/minecraft/valhelsia3/logs:/minecraft/logs - - /data/minecraft/valhelsia3/world:/minecraft/world - - /data/minecraft/valhelsia3/ops.json:/minecraft/ops.json - tags: [ docker, minecraft ] + - name: include tasks for gameservers + include_tasks: tasks/game/{{ task }} + with_items: + - botaniapack2-survival.yml + - gmod.yml + loop_control: + loop_var: task + tags: [ always ] - hosts: game2.desu.ltd tasks: - - name: docker deploy css - docker_container: - name: css - state: started - image: foxylion/steam-css - restart_policy: unless-stopped - command: "/home/steam/entrypoint.sh update" - pull: yes - ports: - - "1200:1200" - - "26901:26901/udp" - - "27005:27005/udp" - - "27015:27015" - - "27015:27015/udp" - - "27020:27020/udp" - volumes: - - /data/css/server.cfg:/home/steam/css/cstrike/cfg/my-server.cfg - tags: [ docker, css ] - - name: docker deploy minecraft botaniapack2-creative - docker_container: - name: botaniapack2-creative - state: started - image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 - restart_policy: unless-stopped - pull: yes - env: - TZ: "America/Chicago" - ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" - JRE_XMX: 3G - JRE_XMS: 3G - FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-botaniapack2/latest.zip" - ports: - - "25565:25565/tcp" - - "25565:25565/udp" - volumes: - - /data/minecraft/botaniapack2-creative/backups:/minecraft/backups - - /data/minecraft/botaniapack2-creative/logs:/minecraft/logs - - /data/minecraft/botaniapack2-creative/world:/minecraft/world - - /data/minecraft/botaniapack2-creative/ops.json:/minecraft/ops.json - - /data/minecraft/botaniapack2-creative/server.properties:/minecraft/server.properties - tags: [ docker, minecraft, botania, creative ] - # https://github.com/mkrupczak3/SCP-SECRET-LAB-DOCKER - # Kinda forked it and changed a few settings tho - - name: docker deploy scpsl - docker_container: - name: scpsl - state: absent - image: rehashedsalt/scpsl:latest - restart_policy: unless-stopped - pull: yes - ports: - - "7777-7784:7777-7784/udp" - - "7777-7784:7777-7784" - volumes: - - /etc/localtime:/etc/localtime:ro - - /home/steam/steamcmd - - /home/steam/scp_server - tags: [ docker, scpsl ] - - name: docker deploy terraria - docker_container: - name: terraria - state: absent - image: rehashedsalt/tmodloader-docker:v0.11.8.3 - restart_policy: unless-stopped - pull: yes - ports: - - 7777:7777 - volumes: - - /etc/localtime:/etc/localtime:ro - - /data/terraria/data:/terraria - tags: [ docker, terraria ] + - name: include tasks for gameservers + include_tasks: tasks/game/{{ task }} + with_items: + - botaniapack2-creative.yml + - css.yml + loop_control: + loop_var: task + tags: [ always ] diff --git a/playbooks/tasks/game/botaniapack2-creative.yml b/playbooks/tasks/game/botaniapack2-creative.yml new file mode 100644 index 0000000..8525ce0 --- /dev/null +++ b/playbooks/tasks/game/botaniapack2-creative.yml @@ -0,0 +1,24 @@ +# vim:ft=ansible: +- name: docker deploy minecraft botaniapack2-creative + docker_container: + name: botaniapack2-creative + state: started + image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 + restart_policy: unless-stopped + pull: yes + env: + TZ: "America/Chicago" + ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" + JRE_XMX: 3G + JRE_XMS: 3G + FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-botaniapack2/latest.zip" + ports: + - "25565:25565/tcp" + - "25565:25565/udp" + volumes: + - /data/minecraft/botaniapack2-creative/backups:/minecraft/backups + - /data/minecraft/botaniapack2-creative/logs:/minecraft/logs + - /data/minecraft/botaniapack2-creative/world:/minecraft/world + - /data/minecraft/botaniapack2-creative/ops.json:/minecraft/ops.json + - /data/minecraft/botaniapack2-creative/server.properties:/minecraft/server.properties + tags: [ docker, minecraft, botania, creative ] diff --git a/playbooks/tasks/game/botaniapack2-survival.yml b/playbooks/tasks/game/botaniapack2-survival.yml new file mode 100644 index 0000000..b3213c6 --- /dev/null +++ b/playbooks/tasks/game/botaniapack2-survival.yml @@ -0,0 +1,24 @@ +# vim:ft=ansible: +- name: docker deploy minecraft botaniapack2-survival + docker_container: + name: botaniapack2-survival + state: started + image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 + restart_policy: unless-stopped + pull: yes + env: + TZ: "America/Chicago" + ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" + JRE_XMX: 5G + JRE_XMS: 3G + FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-botaniapack2/latest.zip" + ports: + - "25565:25565/tcp" + - "25565:25565/udp" + volumes: + - /data/minecraft/botaniapack2-survival/backups:/minecraft/backups + - /data/minecraft/botaniapack2-survival/logs:/minecraft/logs + - /data/minecraft/botaniapack2-survival/world:/minecraft/world + - /data/minecraft/botaniapack2-survival/ops.json:/minecraft/ops.json + - /data/minecraft/botaniapack2-survival/server.properties:/minecraft/server.properties + tags: [ docker, minecraft, botania, survival ] diff --git a/playbooks/tasks/game/css.yml b/playbooks/tasks/game/css.yml new file mode 100644 index 0000000..da5e549 --- /dev/null +++ b/playbooks/tasks/game/css.yml @@ -0,0 +1,19 @@ +# vim:ft=ansible: +- name: docker deploy css + docker_container: + name: css + state: started + image: foxylion/steam-css + restart_policy: unless-stopped + command: "/home/steam/entrypoint.sh update" + pull: yes + ports: + - "1200:1200" + - "26901:26901/udp" + - "27005:27005/udp" + - "27015:27015" + - "27015:27015/udp" + - "27020:27020/udp" + volumes: + - /data/css/server.cfg:/home/steam/css/cstrike/cfg/my-server.cfg + tags: [ docker, css ] diff --git a/playbooks/tasks/game/gmod.yml b/playbooks/tasks/game/gmod.yml new file mode 100644 index 0000000..e08061c --- /dev/null +++ b/playbooks/tasks/game/gmod.yml @@ -0,0 +1,25 @@ +# vim:ft=ansible: +- name: docker deploy gmod + docker_container: + name: gmod + state: started + image: hackebein/garrysmod + restart_policy: unless-stopped + pull: yes + tty: yes + env: + AUTHKEY: "{{ steam_apikey }}" + GAMEMODE: prop_hunt + MAP: ph_islandhouse + WORKSHOP: "2155532035" + WORKSHOPDL: "2155532035" + ports: + - "1200:1200" + - "26901:26901/udp" + - "27005:27005/udp" + - "27015:27015" + - "27015:27015/udp" + - "27020:27020/udp" + volumes: + - /data/gmod:/opt/overlay + tags: [ docker, gmod ] diff --git a/playbooks/tasks/game/scpsl.yml b/playbooks/tasks/game/scpsl.yml new file mode 100644 index 0000000..90a1aae --- /dev/null +++ b/playbooks/tasks/game/scpsl.yml @@ -0,0 +1,18 @@ +# vim:ft=ansible: +# https://github.com/mkrupczak3/SCP-SECRET-LAB-DOCKER +# Kinda forked it and changed a few settings tho +- name: docker deploy scpsl + docker_container: + name: scpsl + state: absent + image: rehashedsalt/scpsl:latest + restart_policy: unless-stopped + pull: yes + ports: + - "7777-7784:7777-7784/udp" + - "7777-7784:7777-7784" + volumes: + - /etc/localtime:/etc/localtime:ro + - /home/steam/steamcmd + - /home/steam/scp_server + tags: [ docker, scpsl ] diff --git a/playbooks/tasks/game/starbound.yml b/playbooks/tasks/game/starbound.yml new file mode 100644 index 0000000..28c5380 --- /dev/null +++ b/playbooks/tasks/game/starbound.yml @@ -0,0 +1,15 @@ +# vim:ft=ansible: +- name: docker deploy starbound + docker_container: + name: starbound + state: absent + image: didstopia/starbound-server + restart_policy: unless-stopped + pull: yes + env: + SKIP_STEAMCMD: "true" + ports: + - "21025:21025" + volumes: + - /data/starbound/main:/steamcmd/starbound + tags: [ docker, starbound ] diff --git a/playbooks/tasks/game/terraria.yml b/playbooks/tasks/game/terraria.yml new file mode 100644 index 0000000..1ccaa3d --- /dev/null +++ b/playbooks/tasks/game/terraria.yml @@ -0,0 +1,14 @@ +# vim:ft=ansible: +- name: docker deploy terraria + docker_container: + name: terraria + state: absent + image: rehashedsalt/tmodloader-docker:v0.11.8.3 + restart_policy: unless-stopped + pull: yes + ports: + - 7777:7777 + volumes: + - /etc/localtime:/etc/localtime:ro + - /data/terraria/data:/terraria + tags: [ docker, terraria ] diff --git a/playbooks/tasks/game/valhelsia3.yml b/playbooks/tasks/game/valhelsia3.yml new file mode 100644 index 0000000..ee87bf2 --- /dev/null +++ b/playbooks/tasks/game/valhelsia3.yml @@ -0,0 +1,23 @@ +# vim:ft=ansible: +- name: docker deploy minecraft valhelsia3 + docker_container: + name: valhelsia3 + state: absent + image: rehashedsalt/minecraft-forge:1.16.5-36.1.13-openjdk11 + restart_policy: unless-stopped + pull: yes + env: + TZ: "America/Chicago" + ARGS: "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1" + JRE_XMX: 5G + JRE_XMS: 2G + FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-valhelsia/server.zip" + ports: + - "25565:25565/tcp" + - "25565:25565/udp" + volumes: + - /data/minecraft/valhelsia3/backups:/minecraft/backups + - /data/minecraft/valhelsia3/logs:/minecraft/logs + - /data/minecraft/valhelsia3/world:/minecraft/world + - /data/minecraft/valhelsia3/ops.json:/minecraft/ops.json + tags: [ docker, minecraft ] diff --git a/playbooks/vars/desultd-pleroma-apache.yml b/playbooks/vars/desultd-pleroma-apache.yml deleted file mode 100644 index b951ab5..0000000 --- a/playbooks/vars/desultd-pleroma-apache.yml +++ /dev/null @@ -1,20 +0,0 @@ -# vim:ft=ansible: -apache_global_vhost_settings: | - DirectoryIndex index.php index.html - Protocols h2 http/1.1 -apache_vhosts: - - servername: cowfee.moe - extra_parameters: | - Redirect permanent / https://cowfee.moe/ -apache_vhosts_ssl: - - servername: cowfee.moe - extra_parameters: | - ProxyPreserveHost On - ProxyRequests Off - ProxyPass / http://127.0.0.1:4000/ nocanon retry=1 - ProxyPassReverse / https://127.0.0.1:4000/ - RequestHeader set X_FORWARDED_PROTO 'https' - RequestHeader set X-Forwarded-Ssl on - certificate_file: /etc/letsencrypt/live/cowfee.moe/fullchain.pem - certificate_key_file: /etc/letsencrypt/live/cowfee.moe/privkey.pem - certificate_chain_file: /etc/letsencrypt/live/cowfee.moe/chain.pem diff --git a/playbooks/vars/desultd-pleroma-certbot.yml b/playbooks/vars/desultd-pleroma-certbot.yml deleted file mode 100644 index d36e637..0000000 --- a/playbooks/vars/desultd-pleroma-certbot.yml +++ /dev/null @@ -1,10 +0,0 @@ -# vim:ft=ansible: -certbot_admin_email: rehashedsalt@cock.li -certbot_create_if_missing: yes -certbot_create_method: standalone -certbot_create_standalone_stop_services: - - apache2 -certbot_certs: - - domains: - - cowfee.moe - - web2.desu.ltd diff --git a/playbooks/vars/desultd-pleroma.yml b/playbooks/vars/desultd-pleroma.yml deleted file mode 100644 index 244acbd..0000000 --- a/playbooks/vars/desultd-pleroma.yml +++ /dev/null @@ -1,16 +0,0 @@ -# vim:ft=ansible: -# Site config -pleroma_hostname: cowfee.moe -pleroma_open_registration: "true" -pleroma_instance_name: Cowfee -pleroma_instance_desc: owo - -# Secret config -pleroma_secret_key_base: "{{ secret_pleroma_key_base }}" -pleroma_secret_signing_salt: "{{ secret_pleroma_signing_salt }}" - -# DB config -pleroma_db_host: 192.168.164.156 -pleroma_db_name: pleroma_cowfee -pleroma_db_user: pleroma-cowfee -pleroma_db_pass: "{{ secret_pleroma_9iron_db_pass }}" diff --git a/playbooks/vars/factorio-main.yml b/playbooks/vars/factorio-main.yml deleted file mode 100644 index 0a414fb..0000000 --- a/playbooks/vars/factorio-main.yml +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=ansible: -server_version: 1.0.0 -download_checksum: sha256:81d9e1aa94435aeec4131c8869fa6e9331726bea1ea31db750b65ba42dbd1464 -service_name: factorio-main -service_root: /opt/factorio/main -factorio_server_settings: - name: "Krabby Land" - description: "Where a kid can have fun" - max_players: 8 - visibility: - public: false - lan: false - admins: [ "rehashed_salt" ]