Update rsnapshot for updated container interface

A linuxserver/rsnapshot image update without tag update broke compatibility.

caddy/Caddyfile

@@ -1,41 +0,0 @@
-(unprotected) {
-	{args[0]}.{$SUBDOMAIN}.{$DOMAIN} {
-		log {
-			output file /var/log/{args[0]}.log
-		}
-		reverse_proxy {args[1]}
-	}
-}
-
-(pathproxy) {
-	handle /{args[0]}* {
-		reverse_proxy http://{args[1]}
-	}
-}
-
-import unprotected seafile host:8082
-import unprotected grafana host:3333
-import unprotected photoprism host:2342
-import unprotected dsmr host:8888
-import unprotected esp host:6052
-import unprotected ha host:8123
-
-{$SUBDOMAIN}.{$DOMAIN} {
-	log {
-		output file /var/log/path.log
-	}
-	import pathproxy jellyfin host:8097
-	import pathproxy transmission host:9091
-	import pathproxy sonarr host:18989
-	import pathproxy radarr host:17878
-	import pathproxy readarr host:18787
-	import pathproxy lidarr host:18686
-	import pathproxy bazarr host:16767
-	import pathproxy facette host:12003
-	import pathproxy gitlab host:19080
-	import pathproxy filebrowser host:8001
-	import pathproxy plik host:8087
-	import pathproxy droppy host:19898
-	import pathproxy ghost host:2368
-	import pathproxy jackett host:9117
-}

caddy/Dockerfile

@@ -1,8 +0,0 @@
-FROM caddy:2.7-builder AS builder
-
-RUN xcaddy build \
-    --with github.com/caddy-dns/route53
-
-FROM caddy:2.7-alpine
-
-COPY --from=builder /usr/bin/caddy /usr/bin/caddy

compose.readarr.yaml

@@ -1,19 +0,0 @@
-services:
-  readarr:
-    container_name: readarr
-    environment:
-    - PUID=1000
-    - PGID=1000
-    - TZ=Europe/Amsterdam
-    external_links:
-    - transmission
-    extra_hosts:
-    - transmission:192.168.2.150
-    image: linuxserver/readarr:develop-0.4.18.2805-ls156
-    ports:
-    - 18787:8787
-    restart: unless-stopped
-    volumes:
-    - /opt/readarr:/config
-    - /media/nubes/downloads:/downloads
-    - /media/neptune/Books/Epub:/books

compose.yaml

@@ -1,47 +0,0 @@
-include:
-# Web
-  - compose.nginx.yaml
-  - compose.filebrowser.yaml
-  - compose.caddy.yaml
-  - compose.ghost.yaml
-  - compose.lighttpd.yaml
-  - compose.plik.yaml
-
-# Authentication
-  - compose.surfshark.yaml
-
-# Download
-  - compose.transmission.yaml
-  - compose.jackett.yaml
-  - compose.radarr.yaml
-  - compose.readarr.yaml
-  - compose.sonarr.yaml
-  - compose.bazarr.yaml
-  - compose.lidarr.yaml
-
-# Media
-  - compose.jellyfin.yaml
-  - compose.photoprism.yaml
-
-# Networking
-  - compose.dns-ad-blocker.yaml
-
-# Backup
-  - compose.rsnapshot.yaml
-  - compose.borgmatic.yaml
-
-# Sensors
-  - compose.homeassistant.yaml
-  - compose.esphome.yaml
-  - compose.collectd.yaml
-
-# Storage
-  - compose.seafile.yaml
-
-# Database
-  - compose.influxdb.yaml
-  - compose.timescaledb.yaml
-  - compose.grafana.yaml
-  - compose.dsmrdb.yaml
-  - compose.dsmr.yaml
-  - compose.facette.yaml

docker-compose.bazarr.yml

@@ -4,7 +4,7 @@ services:
     environment:
     - PUID=1000
     - PGID=1000
-    - TZ=Europe/Amsterdam
+    - TZ=Etc/UTC
     image: linuxserver/bazarr:v1.4.2-ls246
     ports:
     - 16767:6767

docker-compose.caddy.yml

@@ -6,19 +6,14 @@ services:
     depends_on:
     - nginx
     environment:
-    - DOMAIN=veenboer.xyz
-    - SUBDOMAIN=bram
     - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:?}
     - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:?}
     image: caddy
     links:
     - nginx
     ports:
-    - 443:443
+    - 444:443
     restart: unless-stopped
     volumes:
     - /opt/caddy/Caddyfile:/etc/caddy/Caddyfile
     - /opt/caddy/data:/data
-    - /opt/caddy/logs:/var/log
-    extra_hosts:
-    - host:192.168.2.150

docker-compose.dns-ad-blocker.yml

@@ -5,9 +5,9 @@ services:
     - AUTO_UPDATE=1
     - BRANCH=master
     - DNSCRYPT=1
-    - DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.securedns.eu
+    - DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.ns0.dnscrypt.nl
-    - DNSCRYPT_RESOLVER_ADDR=146.185.167.43
+    - DNSCRYPT_RESOLVER_ADDR=45.76.35.212
-    - DNSCRYPT_PROVIDER_KEY=F49F:2C73:4D62:B686:319E:D07E:6919:433B:2F13:85F4:1EFB:CA2F:176D:590B:2E45:3E86
+    - DNSCRYPT_PROVIDER_KEY=4C84:FB8C:0511:5DFA:5F97:C5ED:0329:1370:C78A:BCD6:4E15:DD53:AB08:DE72:FB84:4ACA
     image: oznu/dns-ad-blocker:latest
     ports:
     - 192.168.2.151:53:53/udp

docker-compose.homeassistant.yml

@@ -1,7 +1,7 @@
 services:
   homeassistant:
     container_name: homeassistant
-    image: homeassistant/home-assistant:2025.3
+    image: homeassistant/home-assistant:2024.4.3
     network_mode: host
     privileged: true
     restart: unless-stopped

docker-compose.jellyfin.yml

@@ -3,7 +3,7 @@ services:
     container_name: jellyfin
     devices:
     - /dev/dri/renderD128:/dev/dri/renderD128
-    image: linuxserver/jellyfin:10.10.7
+    image: linuxserver/jellyfin:10.10.3
     ports:
     - 8097:8097
     restart: unless-stopped

docker-compose.openvpn-server.yml

@@ -0,0 +1,16 @@
+services:
+  openvpn-server:
+    cap_add:
+    - NET_ADMIN
+    container_name: openvpn-server
+    extra_hosts:
+    - host:192.168.2.150
+    image: kylemanna/openvpn:2.4
+    network_mode: bridge
+    ports:
+    - 443:443
+    privileged: true
+    restart: unless-stopped
+    volumes:
+    - /opt/openvpn-server:/etc/openvpn
+    - /opt/openvpn-server/logrotate.d/openvpn:/etc/logrotate.d/openvpn

docker-compose.photoprism.yml

@@ -26,7 +26,7 @@ services:
     - PHOTOPRISM_DATABASE_DRIVER=sqlite
     - PHOTOPRISM_UID=1000
     - PHOTOPRISM_GID=1000
-    image: photoprism/photoprism:250426
+    image: photoprism/photoprism:250321
     ports:
     - 2342:2342
     restart: unless-stopped

docker-compose.rsnapshot.yml

@@ -1,8 +1,6 @@
 services:
   rsnapshot:
     container_name: rsnapshot
-    environment:
-    - TZ=Europe/Amsterdam
     image: linuxserver/rsnapshot:1.4.5
     restart: unless-stopped
     volumes:

docker-compose.seafile.yml

@@ -41,7 +41,7 @@ services:
       - INIT_SEAFILE_ADMIN_EMAIL=admin@veenboer.xyz
       - INIT_SEAFILE_ADMIN_PASSWORD=asecret
       - SEAFILE_SERVER_HOSTNAME=seafile.bram.veenboer.xyz
-      - SEAFILE_SERVER_PROTOCOL=https
+      - SEAFILE_SERVER_PROTOCOL=http
       - JWT_PRIVATE_KEY=8LzWzeuQ41z1i8fc1cr1L7Kw80VpTgmT
     depends_on:
       - seafile-mysql

docker-compose.yml

@@ -0,0 +1,47 @@
+include:
+# Web
+  - docker-compose.nginx.yml
+  - docker-compose.filebrowser.yml
+  - docker-compose.caddy.yml
+  - docker-compose.ghost.yml
+  - docker-compose.lighttpd.yml
+  - docker-compose.plik.yml
+
+# Authentication
+  - docker-compose.openvpn-server.yml
+  - docker-compose.surfshark.yml
+
+# Download
+  - docker-compose.transmission.yml
+  - docker-compose.jackett.yml
+  - docker-compose.radarr.yml
+  - docker-compose.sonarr.yml
+  - docker-compose.bazarr.yml
+  - docker-compose.lidarr.yml
+
+# Media
+  - docker-compose.jellyfin.yml
+  - docker-compose.photoprism.yml
+
+# Networking
+  - docker-compose.dns-ad-blocker.yml
+
+# Backup
+  - docker-compose.rsnapshot.yml
+  - docker-compose.borgmatic.yml
+
+# Sensors
+  - docker-compose.homeassistant.yml
+  - docker-compose.esphome.yml
+  - docker-compose.collectd.yml
+
+# Storage
+  - docker-compose.seafile.yml
+
+# Database
+  - docker-compose.influxdb.yml
+  - docker-compose.timescaledb.yml
+  - docker-compose.grafana.yml
+  - docker-compose.dsmrdb.yml
+  - docker-compose.dsmr.yml
+  - docker-compose.facette.yml

nginx/etc/nginx/conf.d/global.conf

@@ -1,143 +0,0 @@
-server {
-    listen 80;
-
-    location / {
-        proxy_pass http://host:80;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /transmission {
-        proxy_pass http://host:9091;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /sonarr {
-        proxy_pass http://host:18989;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /radarr {
-        proxy_pass http://host:17878;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /lidarr {
-        proxy_pass http://host:18686;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /bazarr {
-        proxy_pass http://host:16767;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /jellyfin {
-        proxy_pass http://host:8097;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /facette {
-        proxy_pass http://host:12003;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /gitlab {
-        proxy_pass http://host:19080;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /filebrowser {
-        proxy_pass http://host:8001;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /plik {
-        proxy_pass http://host:8087;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /droppy {
-        rewrite ^/droppy(.*)$ /$1 break;
-        proxy_pass http://host:19898;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /ghost {
-        proxy_pass http://host:2368;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /jackett {
-        proxy_pass http://host:9117;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /dss {
-        proxy_pass http://host:10001;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /pgsql {
-        proxy_pass http://host:5050;
-        include /etc/nginx/conf/proxy.conf;
-    }
-    location /registry {
-        proxy_pass http://host:1080;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
-server { # dsmr
-  listen 80;
-  server_name dsmr.bram.veenboer.xyz;
-  location / {
-    proxy_pass http://host:8888;
-    rewrite ^/dsmr(.*)$ $1 break;
-    include /etc/nginx/conf/proxy.conf;
-  }
-}
-
-server {
-  # homeassistant
-  listen 80;
-  server_name ha.bram.veenboer.xyz;
-  location / {
-      proxy_pass http://host:8123;
-      include /etc/nginx/conf/proxy.conf;
-  }
-}
-
-server { # esphome
-  listen 80;
-  server_name esp.bram.veenboer.xyz;
-  location / {
-      proxy_pass http://host:6052;
-      include /etc/nginx/conf/proxy.conf;
-  }
-}
-
-server {
-    # seafile
-    listen 80;
-    server_name seafile.bram.veenboer.xyz;
-    location / {
-        proxy_pass http://host:8082;
-        include /etc/nginx/conf/proxy.conf;
-        proxy_set_header X-Forwarded-Proto https;
-    }
-    #location /seafhttp {
-    #    rewrite ^/seafhttp(.*)$ $1 break;
-    #    proxy_pass http://host:8182;
-    #    include /etc/nginx/conf/proxy.conf;
-    #    proxy_set_header X-Forwarded-Proto https;
-    #    client_max_body_size 0;
-    #}
-    #location /seafdav {
-    #    proxy_pass http://host:8180;
-    #    include /etc/nginx/conf/proxy.conf;
-    #}
-}
-
-server { # grafana
-	listen 80;
-	server_name grafana.bram.veenboer.xyz;
-	location / {
-		proxy_pass http://host:3333;
-		include /etc/nginx/conf/proxy.conf;
-	}
-}
-
-server { # photoprism
-	listen 80;
-    server_name photoprism.bram.veenboer.xyz;
-    location / {
-        proxy_pass http://host:2342;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-

nginx/etc/nginx/conf/proxy.conf

@@ -1,10 +0,0 @@
-# Proxy
-proxy_redirect off;
-proxy_set_header Host $host;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Ssl on;
-
-# Websocket
-proxy_http_version 1.1;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Connection $http_connection;

nginx/etc/nginx/conf/ssl-sub.conf

@@ -1,21 +0,0 @@
-# Enable SSL
-ssl_certificate /host/etc/certs/.bram.veenboer.online/certificate+intermediate.pem;
-ssl_certificate_key /host/etc/certs/.bram.veenboer.online/key.pem;
-ssl_dhparam /host/etc/certs/.bram.veenboer.online/dh.pem;
-
-# Increased security, from https://cipherli.st/
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
-ssl_ecdh_curve secp384r1;
-ssl_session_cache shared:SSL:10m;
-ssl_session_tickets off;
-ssl_stapling on;
-ssl_stapling_verify on;
-resolver_timeout 5s;
-# add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
-add_header X-Frame-Options DENY;
-add_header X-Content-Type-Options nosniff;
-
-# Redirect HTTP trafic
-error_page 497 https://$host:$server_port$request_uri;

nginx/etc/nginx/conf/ssl.conf

@@ -1,20 +0,0 @@
-# Enable SSL
-ssl_certificate /host/etc/certs/certificate+intermediate.pem;
-ssl_certificate_key /host/etc/certs/key.pem;
-ssl_dhparam /host/etc/certs/dh.pem;
-
-# Increased security, from https://cipherli.st/
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
-ssl_ecdh_curve secp384r1;
-ssl_session_cache shared:SSL:10m;
-ssl_session_tickets off;
-ssl_stapling on;
-ssl_stapling_verify on;
-resolver_timeout 5s;
-add_header X-Frame-Options DENY;
-add_header X-Content-Type-Options nosniff;
-
-# Redirect HTTP trafic
-error_page 497 https://$host:$server_port$request_uri;

nginx/etc/nginx/nginx.conf

@@ -1,36 +0,0 @@
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    client_body_buffer_size 1000M;
-    client_max_body_size 5000M;
-
-    server_tokens off;
-	error_page 401 403 404 /404.html;
-    include /etc/nginx/conf.d/*.conf;
-}