From ec10a5706f3f9dbe737b71ecb1714bbc2d30c05c Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sun, 28 Jun 2020 04:05:14 -0500
Subject: [PATCH] Reorganize roles, split minecraft heads in two

---
 inventory/hosts.yml       |  2 ++
 playbooks/gameservers.yml | 24 ++++++++++++++----------
 playbooks/home.yml        |  2 ++
 site.yml                  |  2 --
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index e2ef3ec..62e641e 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -26,3 +26,5 @@ all:
       hosts:
         game1:
           ansible_host: game1.9iron.club
+        game2:
+          ansible_host: game2.9iron.club
diff --git a/playbooks/gameservers.yml b/playbooks/gameservers.yml
index 02662ac..e0b0d0b 100644
--- a/playbooks/gameservers.yml
+++ b/playbooks/gameservers.yml
@@ -3,6 +3,8 @@
 ---
 - hosts: game1
   roles:
+    - role: backups
+      tags: [ backups ]
     - role: adam
       vars:
         adam_name: lain
@@ -16,8 +18,6 @@
                   33306532343963383331623663616161626533633261383238646164663362396261633736636362
                   373764613833343634346333613639626535
       tags: [ discord, adam ]
-    - role: backups
-      tags: [ backups ]
     - role: minecraft
       vars:
         mcname: "rotary-main"
@@ -38,6 +38,18 @@
 #        mcgamemode: 1
 #        mcleveltype: "flat"
 #      tags: [ gameserver, minecraft, rotarypack ]
+#    - role: terraria
+#      vars:
+#        terraria_name: "main"
+#        terraria_password: "dicks"
+#        terraria_motd: "New major release edition"
+#        terraria_port: 7777
+#        terraria_difficulty: 2
+#      tags: [ gameserver, terraria ]
+- hosts: game2
+  roles:
+    - role: backups
+      tags: [ backups ]
     - role: minecraft
       vars:
         mcname: "magic-main"
@@ -48,11 +60,3 @@
         mcgamemode: 0
         mcleveltype: "default"
       tags: [ gameserver, minecraft, magicpack ]
-#    - role: terraria
-#      vars:
-#        terraria_name: "main"
-#        terraria_password: "dicks"
-#        terraria_motd: "New major release edition"
-#        terraria_port: 7777
-#        terraria_difficulty: 2
-#      tags: [ gameserver, terraria ]
diff --git a/playbooks/home.yml b/playbooks/home.yml
index ed43d76..dd5d25d 100644
--- a/playbooks/home.yml
+++ b/playbooks/home.yml
@@ -3,6 +3,8 @@
 ---
 - hosts: home
   roles:
+    - role: zerotier
+      tags: [ common, zerotier ]
     - role: desktop
       vars:
         mopidy_spotify_username: !vault |
diff --git a/site.yml b/site.yml
index 055d15e..59b5184 100755
--- a/site.yml
+++ b/site.yml
@@ -4,8 +4,6 @@
 - import_playbook: provision.yml
 - hosts: all
   roles:
-    - role: zerotier
-      tags: [ common, zerotier ]
     - role: influxdb
       tags: [ common, influxdb ]
     - role: user