Refactor host variables

inventory/host_vars/node001/main.yml

@@ -1,8 +0,0 @@
-ansible_port: "{{ vault_node001.ansible_port }}"
-ansible_user: "{{ vault_node001.ansible_user }}"
-host_backup:
-  backup:
-    hc_uid: "{{ vault_node001.backup.hc_uid }}"
-    uptime_kuma_token: "{{ vault_node001.backup.uptime_kuma_token }}"
-    volumes:
-      - minecraft-2_data

inventory/host_vars/node002/main.yml

@@ -1,17 +0,0 @@
-ansible_port: "{{ vault_node002.ansible_port }}"
-ansible_user: "{{ vault_node002.ansible_user }}"
-host_backup:
-  backup:
-    hc_uid: "{{ vault_node002.backup.hc_uid }}"
-    uptime_kuma_token: "{{ vault_node002.backup.uptime_kuma_token }}"
-    volumes:
-      - forgejo_data
-      - homebox_data
-      - influxdb_data
-      - jellyfin_config
-      #- jellyfin_media # TODO
-      - reitanlage-oranienburg_data
-      - synapse_media_store
-      - tandoor_mediafiles
-      - uptime-kuma_data
-

inventory/host_vars/node003/main.yml

@@ -1,8 +0,0 @@
-ansible_port: "{{ vault_node003.ansible_port }}"
-ansible_user: "{{ vault_node003.ansible_user }}"
-host_backup:
-  backup:
-    hc_uid: "{{ vault_node003.backup.hc_uid }}"
-    uptime_kuma_token: "{{ vault_node003.backup.uptime_kuma_token }}"
-    volumes:
-      - minio_data

inventory/serguzim.net.yml

@@ -4,7 +4,38 @@ all:
       ansible_connection: local
     node001:
       ansible_host: node001.serguzim.net
+      ansible_port: "{{ vault_node001.ansible_port }}"
+      ansible_user: "{{ vault_node001.ansible_user }}"
+      host_backup:
+        hc_uid: "{{ vault_node001.backup.hc_uid }}"
+        uptime_kuma_token: "{{ vault_node001.backup.uptime_kuma_token }}"
+        volumes:
+          - minecraft-2_data
+
     node002:
       ansible_host: node002.serguzim.net
+      ansible_port: "{{ vault_node002.ansible_port }}"
+      ansible_user: "{{ vault_node002.ansible_user }}"
+      host_backup:
+        hc_uid: "{{ vault_node002.backup.hc_uid }}"
+        uptime_kuma_token: "{{ vault_node002.backup.uptime_kuma_token }}"
+        volumes:
+          - forgejo_data
+          - homebox_data
+          - influxdb_data
+          - jellyfin_config
+          #- jellyfin_media # TODO
+          - reitanlage-oranienburg_data
+          - synapse_media_store
+          - tandoor_mediafiles
+          - uptime-kuma_data
+
     node003:
       ansible_host: node003.serguzim.net
+      ansible_port: "{{ vault_node003.ansible_port }}"
+      ansible_user: "{{ vault_node003.ansible_user }}"
+      host_backup:
+        hc_uid: "{{ vault_node003.backup.hc_uid }}"
+        uptime_kuma_token: "{{ vault_node003.backup.uptime_kuma_token }}"
+        volumes:
+          - minio_data

node002.yml

@@ -12,7 +12,6 @@
       tags: [caddy, reverse-proxy, webserver]
       vars:
         caddy_ports_extra:
-          - 8008:8008
           - 8448:8448
 
 

roles/backup/vars/main.yml

@@ -2,11 +2,11 @@
 backup_svc:
   name: backup
 
-backup_volumes_service: "{{ host_backup.backup.volumes | map_backup_volumes_service }}"
+backup_volumes_service: "{{ host_backup.volumes | map_backup_volumes_service }}"
 
 backup_env:
-  HC_UID: "{{ host_backup.backup.hc_uid }}"
-  UPTIME_KUMA_TOKEN: "{{ host_backup.backup.uptime_kuma_token }}"
+  HC_UID: "{{ host_backup.hc_uid }}"
+  UPTIME_KUMA_TOKEN: "{{ host_backup.uptime_kuma_token }}"
 
   RESTIC_REPOSITORY: "{{ vault_backup.restic.repository }}"
   RESTIC_PASSWORD: "{{ vault_backup.restic.password }}"
@@ -28,4 +28,4 @@ backup_compose:
           - --retry-lock=1m
         restart: never
         hostname: "{{ ansible_facts.hostname }}"
-    volumes: "{{ host_backup.backup.volumes | map_backup_volumes }}"
+    volumes: "{{ host_backup.volumes | map_backup_volumes }}"

roles/forgejo/vars/main.yml

@@ -8,7 +8,6 @@ forgejo_svc:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
   ssh_port: 22
-  ssh_port_alt: 3022
 
 forgejo_env:
   FORGEJO__database__DB_TYPE: postgres
@@ -90,6 +89,5 @@ forgejo_compose:
       app:
         ports:
           - "{{ svc.ssh_port }}:{{ svc.ssh_port }}"
-          - "{{ svc.ssh_port_alt }}:{{ svc.ssh_port }}"
     volumes:
       data:

roles/synapse/vars/main.yml

@@ -12,10 +12,8 @@ synapse_svc:
         reverse_proxy synapse:8008
     }
   extra_svcs:
-    - domain: msrg.cc:8008
+    - domain: matrix.msrg.cc:8448
       additional_domains:
-        - matrix.msrg.cc:8448
-        - matrix.msrg.cc:8008
         - msrg.cc:8448
       docker_host: synapse
       port: 8008