inventory/serguzim.net.yml

@@ -32,7 +32,6 @@ all:
           - influxdb_data
           - jellyfin_config
           #- jellyfin_media # TODO
-          - minio_data
           - ntfy_data
           - reitanlage-oranienburg_data
           - synapse_media_store
@@ -40,3 +39,16 @@ all:
           - teamspeak-fallback-data
           - uptime-kuma_data
           - vikunja_data
+
+    node003:
+      ansible_host: node003.vpn.serguzim.net
+      ansible_port: "{{ vault_node003.ansible_port }}"
+      ansible_user: "{{ vault_node003.ansible_user }}"
+      host_vpn:
+        domain: node003.vpn.serguzim.net
+        ip: 100.64.0.3
+      host_backup:
+        hc_uid: "{{ vault_node003.backup.hc_uid }}"
+        uptime_kuma_token: "{{ vault_node003.backup.uptime_kuma_token }}"
+        volumes:
+          - minio_data

node002.yml

@@ -41,8 +41,6 @@
       tags: [influxdb, sensors, monitoring]
     - role: jellyfin
       tags: [jellyfin, media]
-    - role: minio
-      tags: [minio, storage]
     - role: ntfy
       tags: [ntfy, notifications, push]
     - role: reitanlage_oranienburg

node003.yml

@@ -0,0 +1,13 @@
+---
+- name: Run roles for node003
+  hosts: node003
+  roles:
+    - role: common
+      tags: [always]
+    - role: backup
+      tags: [backup]
+    - role: caddy
+      tags: [caddy, reverse-proxy, webserver]
+
+    - role: minio
+      tags: [minio, storage]

roles/backup/vars/main.yml

@@ -1,7 +1,4 @@
 ---
-
-backup_image: registry.serguzim.me/services/backup
-
 backup_svc:
   name: backup
 
@@ -19,7 +16,7 @@ backup_env:
 
 backup_compose:
   watchtower: false
-  image: "{{ backup_image }}"
+  image: backup
   volumes: "{{ backup_volumes_service }}"
   file:
     services:
@@ -34,7 +31,7 @@ backup_compose:
       mount:
         build:
           context: .
-        image: "{{ backup_image }}"
+        image: backup
         restart: never
         hostname: "{{ ansible_facts.hostname }}"
         env_file:

roles/caddy/vars/main.yml

@@ -24,7 +24,7 @@ caddy_env:
 
 caddy_compose:
   watchtower: false
-  image: registry.serguzim.me/services/caddy:2-alpine
+  image: caddy-custom:2-alpine
   volumes:
     - "./config:/etc/caddy/"
     - data:/data

roles/healthcheck/files/docker-compose.yml

@@ -4,7 +4,7 @@ x-common-elements:
   &common-elements
   build:
     context: .
-  image: registry.serguzim.me/services/healthcheck
+  image: healthcheck
   restart: never
   env_file:
     - service.env

roles/reitanlage_oranienburg/vars/main.yml

@@ -13,7 +13,7 @@ reitanlage_oranienburg_svc:
 
 reitanlage_oranienburg_compose:
   watchtower: false
-  image: registry.serguzim.me/library/grav
+  image: grav
   volumes:
     - data:/var/www/html/
   file:

roles/wiki_js/vars/main.yml

@@ -3,8 +3,6 @@ wiki_js_svc:
   domain: wiki.serguzim.me
   name: wiki-js
   port: 3000
-  caddy_extra: |
-    import analytics
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"

serguzim.net.yml

@@ -4,3 +4,6 @@
 
 - name: Run playbook for node002
   import_playbook: node002.yml
+
+- name: Run playbook for node003
+  import_playbook: node003.yml