Enhance Ansible playbooks and scripts:

- Add '--skip-check' option to update.py to skip dotfiles update checks.
- Update playbook.yml and symlinks.yml to use 'inventory_hostname' for host checks.
- Refactor service task inclusions in server.yml for better readability and maintainability.
- Add new Home Assistant service with corresponding docker-compose configuration.
- Update various service YAML files to use dynamic paths based on inventory_hostname.
- Add tags for service tasks to improve organization and execution control.
- Remove obsolete services.yml file.

config/ansible/tasks/servers/services/caddy/Caddyfile.j2

@@ -28,110 +28,124 @@
 }
 {% endif %}
 
+{% if inventory_hostname == 'mennos-cloud-server' %}
 photos.mvl.sh {
-    import country_block
-    reverse_proxy immich:2283
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy immich:2283
+   tls {{ caddy_email }}
 }
 
 photos.vleeuwen.me {
-    import country_block
-    redir https://photos.mvl.sh{uri}
-    tls {{ caddy_email }}
+   import country_block
+   redir https://photos.mvl.sh{uri}
+   tls {{ caddy_email }}
 }
 
 karakeep.mvl.sh {
-    import country_block
-    reverse_proxy karakeep:3000
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy karakeep:3000
+   tls {{ caddy_email }}
 }
 
 hoarder.mvl.sh {
-    import country_block
-    redir https://karakeep.mvl.sh{uri}
+   import country_block
+   redir https://karakeep.mvl.sh{uri}
 }
 
 git.vleeuwen.me git.mvl.sh {
-    import country_block
-    reverse_proxy gitea:3000
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy gitea:3000
+   tls {{ caddy_email }}
 }
 
 status.vleeuwen.me status.mvl.sh {
-    import country_block
-    reverse_proxy uptime-kuma:3001
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy uptime-kuma:3001
+   tls {{ caddy_email }}
 }
 
 sf.mvl.sh {
-    import country_block
-    reverse_proxy seafile:80
+   import country_block
+   reverse_proxy seafile:80
 
-    handle /seafdav* {
-        reverse_proxy seafile:8080
-    }
+   handle /seafdav* {
+       reverse_proxy seafile:8080
+   }
 
-    tls {{ caddy_email }}
+   tls {{ caddy_email }}
 }
 
 of.mvl.sh {
-    import country_block
-    reverse_proxy onlyoffice:80 {
-        header_up Host {host}
-        header_up X-Real-IP {remote}
-        header_up X-Forwarded-For {remote}
-        header_up X-Forwarded-Proto {scheme}
-    }
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy onlyoffice:80 {
+       header_up Host {host}
+       header_up X-Real-IP {remote}
+       header_up X-Forwarded-For {remote}
+       header_up X-Forwarded-Proto {scheme}
+   }
+   tls {{ caddy_email }}
 }
 
 fsm.mvl.sh {
-    import country_block
-    reverse_proxy factorio-server-manager:80
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy factorio-server-manager:80
+   tls {{ caddy_email }}
 }
 
 df.mvl.sh {
-    import country_block
-    redir / https://git.mvl.sh/vleeuwenmenno/dotfiles/raw/branch/master/setup.sh
-    tls {{ caddy_email }}
+   import country_block
+   redir / https://git.mvl.sh/vleeuwenmenno/dotfiles/raw/branch/master/setup.sh
+   tls {{ caddy_email }}
 }
 
 overseerr.mvl.sh jellyseerr.mvl.sh overseerr.vleeuwen.me jellyseerr.vleeuwen.me {
-    import country_block
-    reverse_proxy mennos-server:5555
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy mennos-server:5555
+   tls {{ caddy_email }}
 }
 
 jellyfin.mvl.sh jellyfin.vleeuwen.me {
-    import country_block
-    reverse_proxy jellyfin:8096
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy jellyfin:8096
+   tls {{ caddy_email }}
 }
 
 fladder.mvl.sh {
-    import country_block
-    reverse_proxy fladder:80
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy fladder:80
+   tls {{ caddy_email }}
 }
 
 ip.mvl.sh {
-    import country_block
-    reverse_proxy echoip:8080 {
-        header_up X-Real-IP {http.request.remote.host}
-        header_up X-Forwarded-For {http.request.remote.host}
-        header_up X-Forwarded-Proto {scheme}
-        header_up X-Forwarded-Host {host}
-    }
-    tls {{ caddy_email }}
+   import country_block
+   reverse_proxy echoip:8080 {
+       header_up X-Real-IP {http.request.remote.host}
+       header_up X-Forwarded-For {http.request.remote.host}
+       header_up X-Forwarded-Proto {scheme}
+       header_up X-Forwarded-Host {host}
+   }
+   tls {{ caddy_email }}
 }
 
 http://ip.mvl.sh {
-    import country_block
-    reverse_proxy echoip:8080 {
-        header_up X-Real-IP {http.request.remote.host}
-        header_up X-Forwarded-For {http.request.remote.host}
-        header_up X-Forwarded-Proto {scheme}
-        header_up X-Forwarded-Host {host}
-    }
+   import country_block
+   reverse_proxy echoip:8080 {
+       header_up X-Real-IP {http.request.remote.host}
+       header_up X-Forwarded-For {http.request.remote.host}
+       header_up X-Forwarded-Proto {scheme}
+       header_up X-Forwarded-Host {host}
+   }
 }
+{% elif inventory_hostname == 'mennos-server' %}
+home.vleeuwen.me {
+   import country_block
+   reverse_proxy host.docker.internal:8123 {
+       header_up Host {upstream_hostport}
+       header_up X-Real-IP {http.request.remote.host}
+       header_up X-Forwarded-For {http.request.remote.host}
+       header_up X-Forwarded-Proto {scheme}
+       header_up X-Forwarded-Host {host}
+   }
+   tls {{ caddy_email }}
+}
+{% endif %}

config/ansible/tasks/servers/services/caddy/caddy.yml

@@ -4,18 +4,19 @@
       - name: Set Caddy directories
         ansible.builtin.set_fact:
             caddy_service_dir: "{{ ansible_env.HOME }}/services/caddy"
-            caddy_data_dir: "/mnt/object_storage/services/caddy"
+            caddy_data_dir: "{{ '/mnt/services/caddy' if inventory_hostname == 'mennos-server' else '/mnt/object_storage/services/caddy' }}"
+            geoip_db_path: "{{ '/mnt/services/echoip' if inventory_hostname == 'mennos-server' else '/mnt/object_storage/services/echoip' }}"
             caddy_email: "{{ lookup('community.general.onepassword', 'qwvcr4cuumhqh3mschv57xdqka', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='email') }}"
 
-      - name: Setup country blocking
-        ansible.builtin.include_tasks: country-blocking.yml
-
       - name: Create Caddy directory
         ansible.builtin.file:
             path: "{{ caddy_service_dir }}"
             state: directory
             mode: "0755"
 
+      - name: Setup country blocking
+        ansible.builtin.include_tasks: country-blocking.yml
+
       - name: Copy Dockerfile for custom Caddy build
         ansible.builtin.copy:
             src: Dockerfile

config/ansible/tasks/servers/services/caddy/country-blocking.yml

@@ -10,7 +10,7 @@
 
       - name: Check if MaxMind Country database is available
         ansible.builtin.stat:
-            path: "/mnt/object_storage/services/echoip/GeoLite2-Country.mmdb"
+            path: "{{ geoip_db_path }}/GeoLite2-Country.mmdb"
         register: maxmind_country_db
         when: enable_country_blocking | default(false)
 
@@ -36,7 +36,7 @@
         ansible.builtin.debug:
             msg:
                 - "⚠️  WARNING: MaxMind Country database not found!"
-                - "Expected location: /mnt/object_storage/services/echoip/GeoLite2-Country.mmdb"
+                - "Expected location: {{ geoip_db_path }}/GeoLite2-Country.mmdb"
                 - "Country blocking will not work until EchoIP service is deployed"
                 - "Run: dotf update --ansible --tags echoip"
         when:

config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2

@@ -11,7 +11,7 @@ services:
       - {{ caddy_data_dir }}/data:/data
       - {{ caddy_data_dir }}/config:/config
       - {{ caddy_service_dir }}/Caddyfile:/etc/caddy/Caddyfile
-      - /mnt/object_storage/services/echoip:/etc/caddy/geoip:ro
+      - {{ geoip_db_path }}:/etc/caddy/geoip:ro
       - {{ caddy_data_dir }}/logs:/var/log/caddy
     environment:
       - TZ=Europe/Amsterdam