Move inventory to yaml syntax

4 files changed, 70 insertions, 40 deletions

diff --git a/ansible.cfg b/ansible.cfg
index 480a2c2..f624d91 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,5 @@
 [defaults]
-inventory = inventory.ini,inventory_vars.ini
+inventory = inventory.yml
 interpreter_python = auto_silent
 jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n
 
diff --git a/inventory.ini b/inventory.ini
deleted file mode 100644
index a6c7fb5..0000000
--- a/inventory.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# inventory.ini ~~ rgoncalves.se infrastructure
-
-[local]
-localhost
-
-[servers]
-CHV-DC-rainbow
-OOP-DV-stack0
-OOP-FS-raspberry
-
-[openbsd]
-CHV-DC-rainbow
-OOP-DV-stack0
-
-[centos]
-
-[debian]
-OOP-FS-raspberry
-
diff --git a/inventory.yml b/inventory.yml
new file mode 100644
index 0000000..9af3db2
--- /dev/null
+++ b/inventory.yml
@@ -0,0 +1,69 @@
+
+# inventory.yml
+
+--- 
+
+all:
+
+  vars:
+    packages:
+      zsh: "zsh"
+      curl: "curl"
+      tmux: "tmux"
+      wget: "wget"
+      figlet: "figlet"
+      neovim: "neovim"
+    group:
+      root: "root"
+    ansible_port: "22"
+
+  hosts:
+
+    CHV-DC-rainbow:
+      ansible_host: "CHV-DC-rainbow"
+      services:
+        tcp:
+          ssh: "22"
+          httpd: "80"
+        udp:
+          wg: "53"
+
+    OOP-DV-stack0:
+      ansible_host: "OOP-DV-stack0"
+      services:
+        tcp:
+          ssh: "22"
+          nextcloud: "80"
+
+    OOP-FS-raspberry:
+      ansible_host: "OOP-FS-raspberry"
+      services:
+        tcp:
+          ssh: "22"
+          syncthing: "8384"
+
+
+  children:
+    servers:
+      hosts:
+        CHV-DC-rainbow:
+        OOP-DV-stack0:
+        OOP-FS-raspberry:
+
+    openbsd:
+      vars:
+        path_zsh_bin: "/usr/local/bin/zsh"
+        ansible_become_method: "doas"
+        group: 
+          root: "wheel"
+
+      hosts:
+        CHV-DC-rainbow:
+        OOP-DV-stack0:
+
+    debian:
+      vars:
+        path_zsh_bin: "/bin/zsh"
+
+      hosts:
+        OOP-FS-raspberry:
diff --git a/inventory_vars.ini b/inventory_vars.ini
deleted file mode 100644
index d5e173a..0000000
--- a/inventory_vars.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[servers:vars]
-package_curl="curl"
-package_neovim="neovim"
-package_tmux="tmux"
-package_wget="wget"
-package_zsh="zsh"
-
-[openbsd:vars]
-group_root="wheel"
-path_zsh_bin="/usr/local/bin/zsh"
-
-[centos:vars]
-group_root="root"
-path_zsh_bin="/bin/zsh"
-
-[debian:vars]
-group_root="root"
-path_zsh_bin="/bin/zsh"
-