From d469ef3f68ac07632b194b1b4fad67505c563ddb Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Fri, 9 Feb 2024 13:51:46 +0100
Subject: [PATCH] cleanup and improvements

---
 paperless/docker-compose.yaml |  5 +++--
 proxy/docker-compose.yaml     | 22 +++++++++++-----------
 pull-min.sh                   |  1 -
 start-min.sh                  |  1 -
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/paperless/docker-compose.yaml b/paperless/docker-compose.yaml
index 2da48dd..9e77420 100644
--- a/paperless/docker-compose.yaml
+++ b/paperless/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
     labels:
       - "docker.group=paperless"
 
-  webserver:
+  paperless-ngx:
     image: ghcr.io/paperless-ngx/paperless-ngx:${PAPERLESS_NGX_VERSION}
     restart: unless-stopped
     networks:
@@ -46,7 +46,8 @@ services:
       - ${CONSUME_PATH}:/usr/src/paperless/consume
     environment:
       - PAPERLESS_REDIS=redis://broker:6379
-      - PAPERLESS_DBHOST=${POSTGRES_DB}
+      - PAPERLESS_DBHOST=db
+      - PAPERLESS_DBNAME=${POSTGRES_DB}
       - PAPERLESS_DBUSER=${POSTGRES_USER}
       - PAPERLESS_DBPASS=${POSTGRES_PASSWORD}
       - PAPERLESS_OCR_LANGUAGES=deu eng
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 37522cb..9600d1d 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -38,17 +38,17 @@ services:
     privileged: true
 
 
-  whoami:
-    image: containous/whoami
-    networks:
-      - web
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.${HOSTNAME}`)"
-      - "traefik.http.routers.whoami.entrypoints=web"
-      - "traefik.http.services.whoami.loadbalancer.server.port=80"
-      - "docker.group=proxy"
-    restart: unless-stopped
+#  whoami:
+#    image: containous/whoami
+#    networks:
+#      - web
+#    labels:
+#      - "traefik.enable=true"
+#      - "traefik.http.routers.whoami.rule=Host(`whoami.${HOSTNAME}`)"
+#      - "traefik.http.routers.whoami.entrypoints=web"
+#      - "traefik.http.services.whoami.loadbalancer.server.port=80"
+#      - "docker.group=proxy"
+#    restart: unless-stopped
 
 
 networks:
diff --git a/pull-min.sh b/pull-min.sh
index c2d2df6..b457b76 100755
--- a/pull-min.sh
+++ b/pull-min.sh
@@ -6,4 +6,3 @@ function pull {
 
 pull proxy;
 pull telegraf;
-pull portainer;
diff --git a/start-min.sh b/start-min.sh
index 5eb72c9..92d5258 100755
--- a/start-min.sh
+++ b/start-min.sh
@@ -7,5 +7,4 @@ function up {
 
 up proxy;
 up telegraf;
-up portainer;