refactor(vars): flatten group_vars and host_vars files

5 files changed, 78 insertions, 46 deletions

diff --git a/host_vars/ams-dcontroller-01.yml b/host_vars/ams-dcontroller-01.yml
new file mode 100644
index 0000000..0c319d6
--- /dev/null
+++ b/host_vars/ams-dcontroller-01.yml
@@ -0,0 +1,78 @@
+---
+
+ansible_host: 46.23.91.150
+
+git_dir: /var/www/data/git
+sshd__listen_port: "{{ ansible_port }}"
+relayd__connected_hosts: servers
+acme_connected_hosts: servers
+
+cgit_listen_port: 8002
+cgit_domain_name: git.rgoncalves.se
+cgit_favicon_url: "https://{{ __domain_name }}/img/favicon.ico"
+cgit_logo_url: "https://{{ __domain_name }}/img/favicon.ico"
+cgit_css_url: "https://{{ __domain_name }}/style/cgit.css"
+cgit_description: development hub
+cgit_readme_url: https://{{ __domain_name }}"
+
+nextcloud__listen_port: 8003
+nextcloud__domain_name: cloud.rgoncalves.se
+
+__ip:
+  external: 46.23.91.150
+  internal: 10.10.0.1
+
+__services:
+  - name: ssh
+    protocol: tcp
+    port: "{{ ansible_port }}"
+
+  - name: wireguard
+    protocol: udp
+    port: 53
+
+  - name: http
+    protocol: tcp
+    port: 80
+
+  - name: https
+    protocol: tcp
+    port: 443
+
+  - name: site
+    domain: rgoncalves.se
+    protocol: tcp
+    port: 8001
+    extra:
+      type: static
+
+  - name: git
+    domain: "{{ cgit_domain_name }}"
+    protocol: tcp
+    port: "{{ cgit_listen_port }}"
+
+  - name: nextcloud
+    domain: "{{ nextcloud__domain_name }}"
+    protocol: tcp
+    port: "{{ nextcloud__listen_port }}"
+
+  - name: melpiat
+    domain: melpiat.com
+    protocol: tcp
+    port: 8004
+    extra:
+      type: static
+
+  - name: sousleciel
+    domain: sousleciel.lol
+    protocol: tcp
+    port: 8005
+    extra:
+      type: static
+
+  - name: healthcheck
+    domain: owo.rgoncalves.se
+    protocol: tcp
+    port: 8006
+    extra:
+      type: static
diff --git a/host_vars/ams-dcontroller-01/main.yml b/host_vars/ams-dcontroller-01/main.yml
deleted file mode 100644
index 2c7461a..0000000
--- a/host_vars/ams-dcontroller-01/main.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-
-ansible_port: 71
-
-httpd_use_nfs: false
-git_dir: /var/www/data/git
-sshd_listen_port: "{{ ansible_port }}"
-relayd_connected_hosts: servers
-acme_connected_hosts: servers
-
-cgit_listen_port: 1235
-cgit_domain_name: git.rgoncalves.se
-cgit_favicon_url: "https://{{ __domain_name }}/img/favicon.ico"
-cgit_logo_url: "https://{{ __domain_name }}/img/favicon.ico"
-cgit_css_url: "https://{{ __domain_name }}/style/cgit.css"
-cgit_description: development hub
-cgit_readme_url: https://{{ __domain_name }}"
-
-__is_vm: true
-
-__ip:
-  external: 185.203.114.234
-  internal: 10.10.0.1
-
-__services:
-  - name: ssh
-    protocol: tcp
-    port: 22
-
-  - name: wireguard
-    protocol: udp
-    port: 53
-
-  - name: http
-    domain: rgoncalves.se
-    protocol: tcp
-    port: 80
-
-  - name: https
-    protocol: tcp
-    port: 443
-
-  - name: git
-    domain: "{{ cgit_domain_name }}"
-    protocol: tcp
-    port: "{{ cgit_listen_port }}"
diff --git a/host_vars/localhost/main.yml b/host_vars/localhost.yml
index 2947445..2947445 100644
--- a/host_vars/localhost/main.yml
+++ b/host_vars/localhost.yml
diff --git a/host_vars/wstation-think-01/main.yml b/host_vars/wstation-think-01.yml
index c1a5ef7..c1a5ef7 100644
--- a/host_vars/wstation-think-01/main.yml
+++ b/host_vars/wstation-think-01.yml
diff --git a/host_vars/wstation-xps-01/main.yml b/host_vars/wstation-xps-01.yml/main.yml
index bf2e0c8..bf2e0c8 100644
--- a/host_vars/wstation-xps-01/main.yml
+++ b/host_vars/wstation-xps-01.yml/main.yml