Merge branch 'master' of ssh://git.mvl.sh/vleeuwenmenno/dotfiles

config/ansible/group_vars/servers.yml

@@ -18,6 +18,7 @@ allowed_countries_codes:
     - KR # South Korea
     - SK # Slovakia
     - FL # Finland
+    - DK # Denmark
 
 # IP ranges for blocked countries (generated automatically)
 # This will be populated by the country blocking script

config/ansible/tasks/servers/server.yml

@@ -107,7 +107,7 @@
         hosts:
           - mennos-cachyos-desktop
       - name: arr-stack
-        enabled: false
+        enabled: true
         hosts:
           - mennos-cachyos-desktop
       - name: home-assistant

config/ansible/tasks/servers/services/arr-stack/arr-stack.yml

@@ -4,7 +4,7 @@
     - name: Set ArrStack directories
       ansible.builtin.set_fact:
         arr_stack_service_dir: "{{ ansible_env.HOME }}/services/arr-stack"
-        arr_stack_data_dir: "/mnt/object_storage/services/arr-stack"
+        arr_stack_data_dir: "/mnt/services/arr-stack"
 
     - name: Create ArrStack directory
       ansible.builtin.file:

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

@@ -13,7 +13,7 @@ services:
       - host.docker.internal:host-gateway
     volumes:
       - {{ arr_stack_data_dir }}/radarr-config:/config
-      - /mnt/object_storage:/storage
+      - /mnt/data:/mnt/data
     restart: "unless-stopped"
     networks:
       - arr_stack_net
@@ -27,7 +27,7 @@ services:
       - TZ=Europe/Amsterdam
     volumes:
       - {{ arr_stack_data_dir }}/sonarr-config:/config
-      - /mnt/object_storage:/storage
+      - /mnt/data:/mnt/data
     ports:
       - 8989:8989
     extra_hosts:
@@ -43,12 +43,12 @@ services:
       - PGID=100
       - TZ=Europe/Amsterdam
     ports:
-      - 8686:8686
+      - 6969:6969
     extra_hosts:
       - host.docker.internal:host-gateway
     volumes:
       - {{ arr_stack_data_dir }}/whisparr-config:/config
-      - /mnt/object_storage:/storage
+      - /mnt/data:/mnt/data
     restart: unless-stopped
     networks:
       - arr_stack_net
@@ -86,15 +86,14 @@ services:
     networks:
       - arr_stack_net
 
-  jellyseerr:
-    image: fallenbagel/jellyseerr
-    container_name: jellyseerr
+  overseerr:
+    image: sctx/overseerr:latest
     environment:
       - PUID=1000
       - PGID=100
       - TZ=Europe/Amsterdam
     volumes:
-      - {{ arr_stack_data_dir }}/jellyseerr-config:/app/config
+      - {{ arr_stack_data_dir }}/overseerr-config:/app/config
     ports:
       - 5055:5055
     extra_hosts:
@@ -106,7 +105,6 @@ services:
 
 networks:
   arr_stack_net:
-    name: arr_stack_net
   caddy_network:
     external: true
     name: caddy_default

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

@@ -155,9 +155,15 @@ http://ip.mvl.sh http://ip.vleeuwen.me {
    }
 }
 
-overseerr.mvl.sh overseerr.vleeuwen.me {
+overseerr.mvl.sh {
    import country_block
-   reverse_proxy host.docker.internal:5555
+   reverse_proxy overseerr:5055
+   tls {{ caddy_email }}
+}
+
+overseerr.vleeuwen.me {
+   import country_block
+   redir https://overseerr.mvl.sh
    tls {{ caddy_email }}
 }
 

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

@@ -33,8 +33,7 @@ services:
       - TZ=Europe/Amsterdam
     volumes:
       - {{ downloaders_data_dir }}/sabnzbd-config:/config
-      - {{ object_storage_dir }}:/storage
-      - {{ local_data_dir }}:/local
+      - {{ local_data_dir }}:{{ local_data_dir }}
     restart: unless-stopped
     network_mode: "service:gluetun"
     depends_on:
@@ -51,8 +50,7 @@ services:
       - TZ=Europe/Amsterdam
     volumes:
       - {{ downloaders_data_dir }}/qbit-config:/config
-      - {{ object_storage_dir }}:/storage
-      - {{ local_data_dir }}:/local
+      - {{ local_data_dir }}:{{ local_data_dir }}
     depends_on:
       gluetun:
         condition: service_healthy

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

@@ -3,7 +3,6 @@
   block:
     - name: Set Downloaders directories
       ansible.builtin.set_fact:
-        object_storage_dir: "/mnt/object_storage"
         local_data_dir: "/mnt/data"
         downloaders_service_dir: "{{ ansible_env.HOME }}/services/downloaders"
         downloaders_data_dir: "/mnt/services/downloaders"

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

@@ -4,7 +4,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
-      - 8686:8080
+      - 8800:8080
     environment:
       - DOZZLE_NO_ANALYTICS=true
     restart: unless-stopped