cachyos compatibility

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

@@ -100,7 +100,7 @@ df.mvl.sh {
 
 overseerr.mvl.sh jellyseerr.mvl.sh overseerr.vleeuwen.me jellyseerr.vleeuwen.me {
    import country_block
-   reverse_proxy mennos-server:5555
+   reverse_proxy mennos-cachyos-desktop:5555
    tls {{ caddy_email }}
 }
 
@@ -115,28 +115,7 @@ fladder.mvl.sh {
    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 }}
-}
-
-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}
-   }
-}
-{% elif inventory_hostname == 'mennos-server' %}
+{% elif inventory_hostname == 'mennos-cachyos-desktop' %}
 home.vleeuwen.me {
    import country_block
    reverse_proxy host.docker.internal:8123 {
@@ -158,4 +137,25 @@ jellyfin.mvl.sh jellyfin.vleeuwen.me {
    reverse_proxy jellyfin:8096
    tls {{ caddy_email }}
 }
+
+ip.mvl.sh ip.vleeuwen.me {
+   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 http://ip.vleeuwen.me {
+   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}
+   }
+}
 {% endif %}

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

@@ -4,8 +4,8 @@
       - name: Set Caddy directories
         ansible.builtin.set_fact:
             caddy_service_dir: "{{ ansible_env.HOME }}/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_data_dir: "{{ '/mnt/services/caddy' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/caddy' }}"
+            geoip_db_path: "{{ '/mnt/services/echoip' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/echoip' }}"
             caddy_email: "{{ lookup('community.general.onepassword', 'Caddy (Proxy)', vault='Dotfiles', field='email') }}"
 
       - name: Create Caddy directory