vpn/DNS angepasst

paperless/docker-compose.yml

@@ -48,19 +48,16 @@ services:
       - "com.centurylinklabs.watchtower.monitor-only=true"
 
   webserver:
-    image: ghcr.io/paperless-ngx/paperless-ngx
+    image: ghcr.io/paperless-ngx/paperless-ngx:latest
     container_name: paperless_app
     restart: unless-stopped
     depends_on:
       - db
       - broker
+      - gotenberg
+      - tika
     ports:
-      - 8009:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
+      - 8009:8000/tcp
     volumes:
       - ./data:/usr/src/paperless/data
       - ./export:/usr/src/paperless/export
@@ -71,12 +68,13 @@ services:
     environment:
       PAPERLESS_REDIS: redis://broker:6379
       PAPERLESS_DBHOST: db
+      PAPERLESS_BIND_ADDR: 0.0.0.0
       PAPERLESS_TIKA_ENABLED: 1
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
 
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:7.10
+    image: docker.io/gotenberg/gotenberg:8.7
     restart: unless-stopped
 
     # The gotenberg chromium route is used to convert .eml files. We do not
@@ -88,7 +86,7 @@ services:
       - "--api-timeout=60"
 
   tika:
-    image: ghcr.io/paperless-ngx/tika:latest
+    image: docker.io/apache/tika:latest
     restart: unless-stopped
 
 volumes:
@@ -98,4 +96,4 @@ volumes:
     driver_opts:
       type: nfs4
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"
+      device: ":${PFAD}"

vpn/docker-compose.yml

@@ -4,9 +4,10 @@ services:
     container_name: wg-easy
     environment:
       - WG_HOST=${HOST}
-      - WG_DEFAULT_DNS=192.168.0.1, fritz.box
-      - WG_ALLOWED_IPS=10.8.0.0/24, 192.168.0.0/24
+      - WG_DEFAULT_DNS=192.168.0.111, 10.1.6.2, localdomain
+      #- WG_ALLOWED_IPS=10.8.0.0/24, 192.168.0.0/24
       - PASSWORD_HASH=${HASH}
+      - UI_TRAFFIC_STATS=true
     volumes:
       - ./wg-easy:/etc/wireguard
     ports: