Definitive refactor of inventory in sub-files

7 files changed, 44 insertions, 33 deletions

diff --git a/group_vars/all.yml b/group_vars/all.yml
index a76a28b..31daa6f 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,6 +1,6 @@
 
-# all ~~ group_vars/all.yml
-# all machines
+# openbsd.yml ~~ group_vars/
+# openbsd machines
 
 ---
 
diff --git a/group_vars/alpine.yml b/group_vars/alpine.yml
index dc39690..448587c 100644
--- a/group_vars/alpine.yml
+++ b/group_vars/alpine.yml
@@ -4,16 +4,9 @@
 
 ---
 
-ansible_become_method: "sudo"
-
-user_op: "puffy"
-
-group_root: "root"
-
 path_zsh: "/usr/bin/zsh"
 path_zshconfig: "/etc/zsh/zshrc"
 path_tmuxconfig: "/etc/tmux.conf"
 path_gitshell: "/usr/bin/git-shell"
 
-os_type: "linux"
 os_distribution: "alpine"
diff --git a/group_vars/bsd.yml b/group_vars/bsd.yml
new file mode 100644
index 0000000..65ebce9
--- /dev/null
+++ b/group_vars/bsd.yml
@@ -0,0 +1,13 @@
+
+# bsd ~~ group_vars/bsd.yml
+# *bsd family machines
+
+---
+
+ansible_become_method: "doas"
+
+group_root: "wheel"
+user_op: "puffy"
+
+os_type: "bsd"
+
diff --git a/group_vars/debian.yml b/group_vars/debian.yml
index 01aa2f0..9fee07f 100644
--- a/group_vars/debian.yml
+++ b/group_vars/debian.yml
@@ -4,16 +4,9 @@
 
 ---
 
-ansible_become_method: "sudo"
-
-user_op: "puffy"
-
-group_root: "root"
-
 path_zsh: "/usr/bin/zsh"
 path_zshconfig: "/etc/zsh/zshrc"
 path_tmuxconfig: "/etc/tmux.conf"
 path_gitshell: "/usr/bin/git-shell"
 
-os_type: "linux"
 os_distribution: "debian"
diff --git a/group_vars/freebsd.yml b/group_vars/freebsd.yml
index 5ea470e..eb345ac 100644
--- a/group_vars/freebsd.yml
+++ b/group_vars/freebsd.yml
@@ -4,18 +4,11 @@
 
 ---
 
-ansible_become_method: "doas"
-
-user_op: "puffy"
-
-group_root: "wheel"
-
 path_zsh: "/usr/local/bin/zsh"
 path_zshconfig: "/usr/local/etc/zshrc"
 path_tmuxconfig: "/usr/local/etc/tmux.conf"
 path_doasconfig: "/usr/local/etc/doas.conf"
 path_gitshell: "/usr/local/bin/git-shell"
 
-os_type: "bsd"
 os_distribution: "freebsd"
 
diff --git a/group_vars/linux.yml b/group_vars/linux.yml
new file mode 100644
index 0000000..3414cfb
--- /dev/null
+++ b/group_vars/linux.yml
@@ -0,0 +1,13 @@
+
+# linux ~~ group_vars/linux.yml
+# linux family machines
+
+---
+
+ansible_become_method: "sudo"
+
+group_root: "root"
+user_op: "puffy"
+
+os_type: "linux"
+
diff --git a/inventory.ini b/inventory.ini
index aa666bd..91ab46e 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -3,14 +3,7 @@
 #
 # ---
 
-# all hosts
-
-# groups
-
-[servers]
-dcontroller
-stack0
-emb0
+# os distribution
 
 [openbsd]
 dcontroller
@@ -22,6 +15,19 @@ stack0
 emb0
 
 [alpine]
-vm0
-vm1
+stack0-vm0
+stack0-vm1
+stack0-vm2
+
+[linux:children]
+alpine
+debian
 
+[bsd:children]
+freebsd
+openbsd
+
+# all hosts
+[servers:children]
+bsd
+linux