Rename pistorage to tags_pistorage

playbooks/game.yml

@@ -20,159 +20,21 @@
       tags: [ docker, skip-pull ]
 - hosts: game1.desu.ltd
   tasks:
-    - name: docker deploy gmod
+    - name: include tasks for gameservers
-      docker_container:
+      include_tasks: tasks/game/{{ task }}
-        name: gmod
+      with_items:
-        state: started
+        - botaniapack2-survival.yml
-        image: hackebein/garrysmod
+        - gmod.yml
-        restart_policy: unless-stopped
+      loop_control:
-        pull: yes
+        loop_var: task
-        tty: yes
+      tags: [ always ]
-        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 ]
 - hosts: game2.desu.ltd
   tasks:
-    - name: docker deploy css
+    - name: include tasks for gameservers
-      docker_container:
+      include_tasks: tasks/game/{{ task }}
-        name: css
+      with_items:
-        state: started
+        - botaniapack2-creative.yml
-        image: foxylion/steam-css
+        - css.yml
-        restart_policy: unless-stopped
+      loop_control:
-        command: "/home/steam/entrypoint.sh update"
+        loop_var: task
-        pull: yes
+      tags: [ always ]
-        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 ]

playbooks/pik8s.yml

@@ -4,10 +4,6 @@
 # k8s
 - hosts: tags_pik8s
   gather_facts: no
-  tasks:
-    - name: install nfs-common
-      apt: name=nfs-common
-      tags: [ k8s, packages, apt ]
   roles:
     - role: k8s
       tags: [ k8s, skip-pull ]

playbooks/pistorage.yml

@@ -2,7 +2,7 @@
 # vim:ft=ansible:
 ---
 # Mass storage Pis
-- hosts: pistorage
+- hosts: tags_pistorage
   tasks:
     - name: assure mount directory
       file: path=/data state=directory mode=0755

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 ]

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 ]

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 ]

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 ]

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 ]

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 ]

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 ]

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 ]

playbooks/vars/desultd-pleroma-apache.yml

@@ -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

playbooks/vars/desultd-pleroma-certbot.yml

@@ -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

playbooks/vars/desultd-pleroma.yml

@@ -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 }}"

playbooks/vars/factorio-main.yml

@@ -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" ]

roles/common/tasks/packages.yml

@@ -15,6 +15,7 @@
           - jq
           - ncdu
           - net-tools
+          - nfs-common
           - openssh-server
           - pwgen
           - python-is-python3 # God damn you Nextcloud role