Move gameserver configs into their own vars files, too

2021-01-18 05:31:04 -06:00 · 2021-01-18 05:31:04 -06:00 · f1ccf47b27
commit f1ccf47b27
parent e1ed70b055
5 changed files with 93 additions and 73 deletions
--- a/playbooks/game.yml
+++ b/playbooks/game.yml
@ -3,6 +3,9 @@
 # Database servers
 ---
 - hosts: game1.thefuck.how
+  vars_files:
+    - vars/factorio-main.yml
+    - vars/minecraft-valhelsia.yml
  roles:
    - role: backup
      vars:
@ -24,29 +27,6 @@
          - minecraft@vanilla
      tags: [ motd ]
    - role: minecraft
-      vars:
-        minecraft_enabled: no
-        minecraft_name: valhelsia
-        minecraft_version: 1.16.3
-        minecraft_jre_xmx: 5G
-        minecraft_server_properties:
-          - opt: difficulty
-            value: hard
-          - opt: motd
-            value: "Let's get this out onto a tray. Nice, mmkay"
-          - opt: server-port
-            value: 25566
-          - opt: view-distance
-            value: 10
-        minecraft_forge_install: yes
-        minecraft_forge_version: 34.1.42
-        minecraft_forge_packurl: "https://media.forgecdn.net/files/3110/654/Valhelsia_SERVER-pre5-3.1.0.zip"
-        minecraft_forge_mods:
-          - "https://media.forgecdn.net/files/3091/862/ftb-gui-library-1603.1.1.25.jar"
-          - "https://media.forgecdn.net/files/3105/153/ftb-chunks-1603.2.0.43.jar"
-          - "https://media.forgecdn.net/files/3113/275/industrial-foregoing-1.16.4-3.2.2-daea863.jar"
-        minecraft_forge_mods_remove:
-          - industrial-foregoing-1.16.3-3.1.1-a834e76.jar
      tags: [ game, minecraft, forge, valhelsia ]
    - role: factorio
      vars:
@ -64,60 +44,14 @@
          admins: [ "rehashed_salt" ]
      tags: [ game, factorio ]
 - hosts: game1.thefuck.how
+  vars_files:
+    - vars/minecraft-vanilla.yml
  roles:
    - role: minecraft
-      vars:
-        minecraft_enabled: yes
-        minecraft_name: vanilla
-        minecraft_version: 1.16.4
-        minecraft_jre_xmx: 1G
-        minecraft_jre_xms: 512M
-        minecraft_server_properties:
-          - opt: difficulty
-            value: normal
-          - opt: motd
-            value: "brett's new serber"
-          - opt: server-port
-            value: 25565
-          - opt: spawn-protection
-            value: 4
-          - opt: view-distance
-            value: 12
-        minecraft_paper_install: yes
      tags: [ game, minecraft, paper, vanilla ]
 - hosts: game1.thefuck.how
+  vars_files:
+    - vars/minecraft-dammit.yml
  roles:
    - role: minecraft
-      vars:
-        minecraft_name: dammit
-        minecraft_version: 1.7.10
-        minecraft_jre_xmx: 4G
-        minecraft_restart_delay: 30
-        minecraft_server_properties:
-          - opt: allow-flight
-            value: "true"
-          - opt: difficulty
-            value: 3
-          - opt: motd
-            value: "I can't believe that I actually exist"
-          - opt: server-port
-            value: 25567
-          - opt: view-distance
-            value: 12
-        minecraft_forge_install: yes
-        minecraft_forge_version: 10.13.4.1614
-        minecraft_forge_versionstring: "{{ minecraft_version }}-{{ minecraft_forge_version }}-{{ minecraft_version }}"
-        minecraft_forge_jar_name: "forge-{{ minecraft_forge_versionstring }}-universal.jar"
-        minecraft_forge_packurl: "https://www.9iron.club/files/magic-1.7.10-2.zip"
-        minecraft_forge_mods_remove:
-          - DynamicSurroundings-1.7.10-1.0.6.2.jar
-          - favorites-1.2.jar
-          - FullscreenWindowed-1.7.10-1.3.0b.jar
-          - MouseTweaks-2.4.4-mc1.7.10.jar
-          - "Neat 1.0-1.jar"
-          - OptiFine_1.7.10_HD_U_E7.jar
-          - SoundFilters-0.8_for_1.7.X.jar
-          - Stellar+API-0.1.3.8.jar
-          - Stellar+Sky-0.1.5.7.jar
-          - World-Tooltips-1.7.10-1.2.3-79.jar
      tags: [ game, minecraft, forge, dammit ]
--- a/playbooks/vars/factorio-main.yml
+++ b/playbooks/vars/factorio-main.yml
@ -0,0 +1,13 @@
+# 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" ]
--- a/playbooks/vars/minecraft-dammit.yml
+++ b/playbooks/vars/minecraft-dammit.yml
@ -0,0 +1,32 @@
+# vim:ft=ansible:
+minecraft_name: dammit
+minecraft_version: 1.7.10
+minecraft_jre_xmx: 4G
+minecraft_restart_delay: 30
+minecraft_server_properties:
+  - opt: allow-flight
+    value: "true"
+  - opt: difficulty
+    value: 3
+  - opt: motd
+    value: "I can't believe that I actually exist"
+  - opt: server-port
+    value: 25567
+  - opt: view-distance
+    value: 12
+minecraft_forge_install: yes
+minecraft_forge_version: 10.13.4.1614
+minecraft_forge_versionstring: "{{ minecraft_version }}-{{ minecraft_forge_version }}-{{ minecraft_version }}"
+minecraft_forge_jar_name: "forge-{{ minecraft_forge_versionstring }}-universal.jar"
+minecraft_forge_packurl: "https://www.9iron.club/files/magic-1.7.10-2.zip"
+minecraft_forge_mods_remove:
+  - DynamicSurroundings-1.7.10-1.0.6.2.jar
+  - favorites-1.2.jar
+  - FullscreenWindowed-1.7.10-1.3.0b.jar
+  - MouseTweaks-2.4.4-mc1.7.10.jar
+  - "Neat 1.0-1.jar"
+  - OptiFine_1.7.10_HD_U_E7.jar
+  - SoundFilters-0.8_for_1.7.X.jar
+  - Stellar+API-0.1.3.8.jar
+  - Stellar+Sky-0.1.5.7.jar
+  - World-Tooltips-1.7.10-1.2.3-79.jar
--- a/playbooks/vars/minecraft-valhelsia.yml
+++ b/playbooks/vars/minecraft-valhelsia.yml
@ -0,0 +1,23 @@
+# vim:ft=ansible:
+minecraft_enabled: no
+minecraft_name: valhelsia
+minecraft_version: 1.16.3
+minecraft_jre_xmx: 5G
+minecraft_server_properties:
+  - opt: difficulty
+    value: hard
+  - opt: motd
+    value: "Let's get this out onto a tray. Nice, mmkay"
+  - opt: server-port
+    value: 25566
+  - opt: view-distance
+    value: 10
+minecraft_forge_install: yes
+minecraft_forge_version: 34.1.42
+minecraft_forge_packurl: "https://media.forgecdn.net/files/3110/654/Valhelsia_SERVER-pre5-3.1.0.zip"
+minecraft_forge_mods:
+  - "https://media.forgecdn.net/files/3091/862/ftb-gui-library-1603.1.1.25.jar"
+  - "https://media.forgecdn.net/files/3105/153/ftb-chunks-1603.2.0.43.jar"
+  - "https://media.forgecdn.net/files/3113/275/industrial-foregoing-1.16.4-3.2.2-daea863.jar"
+minecraft_forge_mods_remove:
+  - industrial-foregoing-1.16.3-3.1.1-a834e76.jar
--- a/playbooks/vars/minecraft-vanilla.yml
+++ b/playbooks/vars/minecraft-vanilla.yml
@ -0,0 +1,18 @@
+# vim:ft=ansible:
+minecraft_enabled: yes
+minecraft_name: vanilla
+minecraft_version: 1.16.4
+minecraft_jre_xmx: 1G
+minecraft_jre_xms: 512M
+minecraft_server_properties:
+  - opt: difficulty
+    value: normal
+  - opt: motd
+    value: "brett's new serber"
+  - opt: server-port
+    value: 25565
+  - opt: spawn-protection
+    value: 4
+  - opt: view-distance
+    value: 12
+minecraft_paper_install: yes