From e530ab7cef1f54650363aa9c35d5524a15e87844 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 30 Jul 2020 08:52:41 -0500
Subject: [PATCH] Finally make sane our inventory?

---
 inventory/hosts.yml      | 53 ++++++++++++++++++----------------------
 playbooks/webservers.yml |  3 ---
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index d55b074..e1822f9 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -36,38 +36,33 @@ all:
           ansible_host: 172.23.100.1
         lap-th-e560-0:
           ansible_host: 172.23.100.2
-    # Webheads of all sorts
-    webservers:
-      hosts:
-        web1.9iron.club:
-        fedi1.9iron.club:
-        web1.cowfee.moe:
-          vars:
-            backups_frequency: 2h
-    # Gameservers of all sorts
-    gameservers:
-      vars:
-        backups_frequency: 6h
-        steam_api_key: !vault |
-                  $ANSIBLE_VAULT;1.1;AES256
-                  39616163316634306633623435636633623966306537636639316439343839393231376661666335
-                  6136333866633861313566306433393637613364386234360a303832626338373230396665336430
-                  33346530626633616161613635656433356434366437383363663165303862316163323263323230
-                  3334373531646364620a386165626130386265343235363639346230323930626330343235373662
-                  38313431663734343931333462316633643935353038313934663466303834636533616165353961
-                  6438356265656532396363323532616437353831613261323037
-      hosts:
-        game1.9iron.club:
-    # Individual domains
     9iron.club:
       vars:
         zone: 9iron.club
-      hosts:
-        web1.9iron.club:
-        fedi1.9iron.club:
-        game1.9iron.club:
+      children:
+        webservers-9iron:
+          hosts:
+            web1.9iron.club:
+            fedi1.9iron.club:
+        gameservers-9iron:
+          vars:
+            backups_frequency: 6h
+            steam_api_key: !vault |
+                      $ANSIBLE_VAULT;1.1;AES256
+                      39616163316634306633623435636633623966306537636639316439343839393231376661666335
+                      6136333866633861313566306433393637613364386234360a303832626338373230396665336430
+                      33346530626633616161613635656433356434366437383363663165303862316163323263323230
+                      3334373531646364620a386165626130386265343235363639346230323930626330343235373662
+                      38313431663734343931333462316633643935353038313934663466303834636533616165353961
+                      6438356265656532396363323532616437353831613261323037
+          hosts:
+            game1.9iron.club:
     cowfee.moe:
       vars:
         zone: cowfee.moe
-      hosts:
-        web1.cowfee.moe:
+      children:
+        webservers-cofe:
+          hosts:
+            web1.cowfee.moe:
+              vars:
+                backups_frequency: 2h
diff --git a/playbooks/webservers.yml b/playbooks/webservers.yml
index 28aaafb..8a077af 100644
--- a/playbooks/webservers.yml
+++ b/playbooks/webservers.yml
@@ -1,9 +1,6 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
 ---
-- hosts: webservers
-  roles:
-    - apache-php
 - hosts: fedi1.9iron.club
   roles:
     - role: backups