Reenable wg0-fix

photo-collector/docker-compose.yml

@@ -20,8 +20,7 @@ services:
     restart: unless-stopped
     labels:
       traefik.enable: true
-      # Authentication in Immich directly
-      # traefik.http.routers.immich.middlewares: authelia@file
+      traefik.http.routers.immich.middlewares: authelia@file
 
   immich-machine-learning:
     hostname: immich-machine-learning

reverse-proxy/docker-compose.yml

@@ -4,7 +4,8 @@ services:
   traefik:
     hostname: traefik
     image: traefik
-    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    # TODO: Run as non root user
+    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     environment:
       NASCOMPOSE_DOMAIN: ${NASCOMPOSE_DOMAIN?}
       CF_DNS_API_TOKEN_FILE: /run/secrets/cf_dns_token
@@ -27,6 +28,23 @@ services:
       traefik.enable: true
       traefik.http.routers.traefik.service: api@internal
       traefik.http.routers.traefik.middlewares: authelia@file
+#  crowdsec:
+#    hostname: crowdsec
+#    image: crowdsecurity/crowdsec
+#    environment:
+#      COLLECTIONS: "crowdsecurity/traefik"
+#      GID: ${NASCOMPOSE_GID?}
+#    networks:
+#      - reverse-proxy
+#    volumes:
+#      - ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/crowdsec_acquis.yml:/etc/crowdsec/acquis.yaml
+#      - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/crowdsec_config/:/etc/crowdsec/
+#      - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/crowdsec_data/:/var/lib/crowdsec/data/
+#      - ${NASCOMPOSE_SERVICES?}/reverse-proxy/volumes/traefik_logs/:/var/log/traefik/:ro
+#    restart: unless-stopped
+#    labels:
+#      traefik.enable: true
+#      traefik.http.routers.crowdsec.middlewares: authelia@file
 
 networks:
   reverse-proxy:

torrents/docker-compose.yml

@@ -25,8 +25,6 @@ services:
     dns:
       - 1.1.1.1
       - 1.0.0.1
-    devices:
-      - /dev/net/tun:/dev/net/tun
     volumes:
       - ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/volumes/qbittorrent_config/:/config/
       - ${NASCOMPOSE_DATA?}/torrents${TORRENT_SUFFIX?}/:/data/torrents/
@@ -35,7 +33,7 @@ services:
       - ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/99-cron-start:/etc/cont-init.d/99-cron-start:ro
       - ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/config/updateMaMIP:/etc/periodic/hourly/updateMaMIP:ro
       # Secrets
-      - ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/secrets/wg0-fix.conf:/config/wireguard/wg0-fix.conf:ro
+      - ${NASCOMPOSE_SERVICES?}/torrents${TORRENT_SUFFIX?}/secrets/wg0.conf:/config/wireguard/wg0-fix.conf:ro
     restart: unless-stopped
     labels:
       - traefik.enable=true