fix: Add Restic unlock commands for reliable backups

Add unlock commands to Restic repositories in backup script

- Add command to unlock the default Restic repository before backup, improving reliability
- Add command to unlock the USB backup repository to ensure proper access

backup.sh

@@ -4,7 +4,9 @@ source /home/iboaz/.restic.sh
 
 exec > >(logger -t backup) 2>&1
 
+/usr/bin/restic unlock
 /usr/bin/restic backup -o s3.storage-class=INTELLIGENT_TIERING --exclude-file=/home/iboaz/excludes.txt --one-file-system --verbose /
+/usr/bin/restic -r /mnt/usb/backups/ unlock
 /usr/bin/restic -r /mnt/usb/backups/ backup --exclude-file=/home/iboaz/excludes.txt --one-file-system --verbose /
 /usr/bin/restic forget --keep-last 1 --keep-daily 3 --keep-weekly 4 --keep-monthly 3 --keep-yearly 3 --prune
 /usr/bin/restic -r /mnt/usb/backups/ forget --keep-last 1 --keep-daily 7 --keep-weekly 8 --keep-monthly 3 --keep-yearly 3 --prune

caddy/Caddyfile

@@ -44,7 +44,7 @@ pass.local.msws.xyz, pass.msws.xyz {
   reverse_proxy vaultwarden:80
 }
 
-code.local.msws.xyz, code.msws.xyz {
+code.local.msws.xyz, code.msws.xyz, *.code.msws.xyz {
   reverse_proxy code-server:8443
 }
 
@@ -60,6 +60,10 @@ stats.local.msws.xyz {
   reverse_proxy grafana:3000
 }
 
+prom.local.msws.xyz {
+  reverse_proxy prometheus:9090
+}
+
 photos.local.msws.xyz, photos.msws.xyz {
   reverse_proxy immich_server:2283
 }
@@ -73,6 +77,11 @@ photos.local.msws.xyz, photos.msws.xyz {
     }
   }
 
+  handle_path /s/* {
+    rewrite /s/ /
+    reverse_proxy chhoto-url:4567
+  }
+
   reverse_proxy https://msws.github.io {
     header_up Host msws.github.io
   }

caddy/compose.yml

@@ -17,6 +17,7 @@ services:
       - caddy_config:/config
     environment:
       - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN}
+      - CADDY_ADMIN=caddy-caddy-1:2019
     networks:
       - cloudflared
 

calibre/compose.yml

@@ -0,0 +1,54 @@
+services:
+  calibre-web-automated:
+    image: crocodilestick/calibre-web-automated:latest
+    container_name: calibre-web-automated
+    environment:
+      - PUID=1000
+      - PGID=1000
+      # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+      - TZ=America/Los_Angeles 
+    volumes:
+      # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect.
+      - $PWD/config:/config 
+      # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
+      - calibre-downloads:/cwa-book-ingest
+      # If you don't have an existing library, CWA will automatically create one at the bind provided here
+      - $PWD/library:/calibre-library 
+      - /app/calibre-web/gmail.json
+    # ports:
+      # Change the first number to change the port you want to access the Web UI, not the second
+      # - 8083:8083 
+    restart: unless-stopped
+    networks:
+        - cloudflared
+
+  calibre-web-automated-book-downloader:
+    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
+    environment:
+      FLASK_PORT: 8084
+      FLASK_DEBUG: false
+      BOOK_LANGUAGE: en
+      SUPPORTED_FORMATS: epub
+    #ports:
+    #  - 8084:8084
+    # Uncomment the following lines if you want to enable healthcheck
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8084/request/api/status"]
+      interval: 30s
+      timeout: 30s
+      retries: 3
+      start_period: 5s
+    restart: unless-stopped
+    volumes:
+    # This is where the books will be downloaded to, usually it would be 
+    # the same as whatever you gave in "calibre-web-automated"
+      - calibre-downloads:/cwa-book-ingest
+    networks:
+        - cloudflared
+
+volumes:
+  calibre-downloads:
+
+networks:
+  cloudflared:
+    external: true

grafana/prometheus.yml

@@ -37,3 +37,6 @@ scrape_configs:
     bearer_token: 'ZmNmZjkxZDktODU0YS00NDRiLWE2N2YtZTRkZjY5ZGZiZDI4Cg=='
     static_configs:
       - targets: [ 'wakapi:3002' ]
+  - job_name: caddy
+    static_configs:
+      - targets: [ 'caddy-caddy-1:2019' ]