From 5d8c3c313cbb41bdc210df0d768a6c949d55f9d8 Mon Sep 17 00:00:00 2001
From: jbergner <jbergner@send.nrw>
Date: Sat, 21 Jun 2025 22:12:16 +0200
Subject: [PATCH] bugfixes

---
 compose.yml | 56 ++++++++++++++++++++++++++---------------------------
 main.go     |  7 ++++---
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/compose.yml b/compose.yml
index 535ef3a..680d0c9 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 services:
-  flod-pod-master:
+  flodpodmaster:
     image: git.send.nrw/sendnrw/flod-pod:latest
-    container_name: flod-pod-master
+    container_name: flodpodmaster
     labels:
       - traefik.enable=true
       - traefik.http.routers.flodpodmaster.rule=Host(`flod-proxy.send.nrw`)
@@ -16,21 +16,21 @@ services:
       - traefik.http.routers.flodpodmaster0.middlewares=flodpodmaster0-redirect
       - traefik.protocol=http
     depends_on:
-      - flod-redis
+      - flodredis
     networks:
       - traefik-net
     environment:
       # Beispiel – mehrere Listen in einer Kategorie „spam“
       BLOCKLIST_MODE: master
-      REDIS_ADDR: flod-redis:6379
+      REDIS_ADDR: flodredis:6379
       HASH_NAME: bl:flodpod
       MASTER_URL: https://flod-proxy.send.nrw
-    #ports:
+      #ports:
       #- "8080:8080"   # <host>:<container>
     restart: unless-stopped
-  flod-master:
+  flodmaster:
     image: git.send.nrw/sendnrw/flod:latest
-    container_name: flod-master
+    container_name: flodmaster
     labels:
       - traefik.enable=true
       - traefik.http.routers.flodmaster.rule=Host(`flod.send.nrw`)
@@ -47,21 +47,22 @@ services:
     networks:
       - traefik-net
     depends_on:
-      - flod-redis
-      - flod-importer
+      - flodredis
+      - flodimporter
     environment:
       # Redis-Adresse schon per Docker-Netzwerk korrekt:
-      REDIS_ADDR: flod-redis:6379
+      REDIS_ADDR: flodredis:6379
       ROLE: worker
       TTL_HOURS: "720"
-      FLOD_IMPORT_URL: "http://flod-importer:8080"
-    #ports:
+      FLOD_IMPORT_URL: http://flodimporter:8080
+      #ports:
       #- "8080:8080"   # <host>:<container>
     restart: unless-stopped
-
-  flod-importer:
+  flodimporter:
     image: git.send.nrw/sendnrw/flod-ipv64-parser:latest
-    container_name: flod-importer
+    container_name: flodimporter
+    depends_on:
+      - flodredis
     labels:
       - traefik.enable=true
       - traefik.http.routers.flodimporter.rule=Host(`flod-import.send.nrw`)
@@ -80,31 +81,30 @@ services:
       DELAY: ""
       OUTDIR: ""
       LIST: ""
-      LISTEN: ":8080"
-      PREFIX: "http://flod-importer:8080"
+      LISTEN: :8080
+      PREFIX: http://flodimporter:8080
     networks:
       - traefik-net
     restart: unless-stopped
     volumes:
       - importer-lists:/lists
-
-  flod-redis:
+  flodredis:
     image: redis:7-alpine
-    container_name: flod-redis
+    container_name: flodredis
     ports:
-      - "6379:6379"
+      - 6379:6379
     networks:
       - traefik-net
-    command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
+    command:
+      - redis-server
+      - /usr/local/etc/redis/redis.conf
     volumes:
-      - redis-data:/data   # falls du doch Persistence willst
-      - /home/groot/flod/redis.conf:/usr/local/etc/redis/redis.conf:ro
+      - redis-data:/data # falls du doch Persistence willst
+      - /docker/flod_redis/redis.conf:/usr/local/etc/redis/redis.conf:ro
     restart: unless-stopped
-
 networks:
   traefik-net:
     external: true
-
 volumes:
-  redis-data:
-  importer-lists:
+  redis-data: null
+  importer-lists: null
\ No newline at end of file
diff --git a/main.go b/main.go
index 23b4171..f62a7a0 100644
--- a/main.go
+++ b/main.go
@@ -24,7 +24,8 @@ import (
 // Redis + Context
 var ctx = context.Background()
 var rdb = redis.NewClient(&redis.Options{
-	Addr: "flodredis:6379",
+	Addr:     "flodredis:6379",
+	Password: os.Getenv("REDIS_PASS"),
 })
 
 // ──────────────────────────────────────────────────────────────────────────────
@@ -334,7 +335,7 @@ func handleCheck(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var cats []string
-	for a, _ := range blocklistURLs {
+	for a := range blocklistURLs {
 		cats = append(cats, a)
 	}
 
@@ -373,7 +374,7 @@ func handleTraefik(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var cats []string
-	for a, _ := range blocklistURLs {
+	for a := range blocklistURLs {
 		cats = append(cats, a)
 	}