Re-organize host inventory

2022-10-08 20:03:12 +02:00 · 2022-10-08 20:03:12 +02:00 · b1add6ce2c
commit b1add6ce2c
parent cb7ab2782a
8 changed files with 33 additions and 18 deletions
--- a/bank.yaml
+++ b/bank.yaml
@ -1,6 +1,5 @@
 ---
 - hosts: bank
-  vars:
  roles:
    - common
    - bank
--- a/common.yaml
+++ b/common.yaml
@ -0,0 +1,4 @@
+---
+- hosts: debian
+  roles:
+    - common
--- a/group_vars/mqtt_internal.yaml
+++ b/group_vars/mqtt_internal.yaml
@ -0,0 +1 @@
+mqtt_internal_public_host: bitlair.nl
--- a/group_vars/music.yaml
+++ b/group_vars/music.yaml
@ -0,0 +1,3 @@
+music_domain: music.bitlair.nl
+acme_san_domains:
+  - [ music.bitlair.nl ]
--- a/11
+++ b/11
@ -1,11 +0,0 @@
-[bank]
-bank.bitlair.nl
-
-[bar]
-bank-pi.bitlair.nl
-
-[mqtt_internal]
-mqtt.bitlair.nl
-
-[music]
-music.bitlair.nl
--- a/hosts.yaml
+++ b/hosts.yaml
@ -0,0 +1,25 @@
+all:
+  children:
+    raspi:
+      hosts:
+        bank-pi.bitlair.nl:
+    debian:
+      children:
+        bank:
+          hosts:
+            bank.bitlair.nl:
+        git:
+          hosts:
+            git.bitlair.nl:
+        lights:
+          hosts:
+            lights.bitlair.nl:
+        mqtt_internal:
+          hosts:
+            mqtt.bitlair.nl:
+        music:
+          hosts:
+            music.bitlair.nl:
+        www:
+          hosts:
+            cyber.bitlair.nl:
--- a/mqtt-internal.yaml
+++ b/mqtt-internal.yaml
@ -1,7 +1,5 @@
 ---
 - hosts: mqtt_internal
-  vars:
-    mqtt_internal_public_host: bitlair.nl
  roles:
    - common
    - mqtt-internal
--- a/music.yaml
+++ b/music.yaml
@ -1,9 +1,5 @@
 ---
 - hosts: music
-  vars:
-    music_domain: music.bitlair.nl
-    acme_san_domains:
-      - [ music.bitlair.nl ]
  roles:
    - common
    - acme