Tweak host vars for corresponding with updated roles

1 files changed, 33 insertions, 40 deletions

diff --git a/inventory.yml b/inventory.yml
index a3ab73e..28fbe07 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -9,6 +9,7 @@ all:
 
     _i:
       dcontroller: "dcontroller"
+      domain_name: "rgoncalves.se"
       dns:
         - 8.8.8.8
         - 8.8.4.4
@@ -25,6 +26,7 @@ all:
       root: "root"
 
     ansible_port: "22"
+    ansible_python_interpreter: "/usr/bin/python3"
 
 
   # ---
@@ -35,56 +37,41 @@ all:
     # SERVER for domain controller
     dcontroller:
       ansible_host: "dcontroller"
-      ip:
-        inbound: "10.8.0.1"
-        outbound: "185.203.114.234"
+      ip: { in: "10.8.0.1", out: "185.203.114.234" }
       services:
-        tcp:
-          ssh: "22"
-          httpd: "80"
-        udp:
-          wg: "53"
+        - { name: "ssh", proto: "tcp", port: "22", public: "true" }
+        - { name: "httpd", proto: "tcp", port: "80", public: "true", domain: "www" }
+        - { name: "wireguard", proto: "udp", port: "53", public: "true" }
 
     # SERVER for vm
     stack0:
       ansible_host: "stack0"
-      ip:
-        inbound: "10.8.0.40"
-        outbound: "192.168.5.40"
+      ip: { in: "10.8.0.40", out: "192.168.5.40" }
       services:
-        tcp:
-          ssh: "22"
-          nextcloud: "80"
+        - { name: "ssh", proto: "tcp", port: "22", public: "false" }
+        - { name: "nextcloud", proto: "udp", port: "80", public: "true", domain: "cloud" }
+      vms:
+        - { name: "vm0", iso: "alpine", memory: "2G", size: "4G", enabled: "true" }
+        - { name: "vm1", iso: "alpine", memory: "2G", size: "4G", enabled: "true" }
+        - { name: "vm2", iso: "alpine", memory: "2G", size: "4G", enabled: "true" }
+        - { name: "vm3", iso: "alpine", memory: "2G", size: "4G", enabled: "true" }
+        - { name: "vm4", iso: "alpine", memory: "2G", size: "4G", enabled: "true" }
       vm:
-        enabled: true
-        hosts:
-          - "vm-stack0-minecraft"
-          - "vm-stack0-nextcloud"
+        enabled: "true"
 
     # SERVER for personnal file sync
     emb0:
       ansible_host: "emb0"
-      ip:
-        inbound: "10.8.0.41"
-        outbound: "192.168.5.41"
+      ip: { in: "10.8.0.41", out: "192.168.5.41" }
       services:
-        tcp:
-          ssh: "22"
-          syncthing: "8384"
+        - { name: "ssh", proto: "tcp", port: "22", public: "false" }
+        - { name: "syncthing", proto: "tcp", port: "8384", public: "false" }
 
-    vm-stack0-minecraft:
-      ansible_host: "vm-stack0-minecraft"
-      enabled: true
-      iso: "alpine"
-      memory: "2G"
-      size: "4G"
+    vm0:
+      ansible_host: "vm0"
 
-    vm-stack0-nextcloud:
-      ansible_host: "vm-stack0-nextcloud"
-      enabled: true
-      iso: "alpine"
-      memory: "2G"
-      size: "4G"
+    vm1:
+      ansible_host: "vm1"
 
 
   # ---
@@ -99,13 +86,18 @@ all:
         stack0:
         emb0:
 
+    vm:
+      hosts:
+        vm-stack0-minecraft:
+        vm-stack0-nextcloud:
+
     # GROUP openbsd
     openbsd:
       vars:
-        path_zsh_bin: "/usr/local/bin/zsh"
         ansible_become_method: "doas"
-        group: 
-          root: "wheel"
+        ansible_python_interpreter: "/usr/local/bin/python3"
+        group_root: "wheel"
+        path_zsh: "/usr/local/bin/zsh"
 
       hosts:
         dcontroller:
@@ -114,7 +106,8 @@ all:
     # GROUP debian
     debian:
       vars:
-        path_zsh_bin: "/bin/zsh"
+        group_root: "root"
+        path_zsh: "/bin/zsh"
 
       hosts:
         emb0: