Merge branch 'main' of https://git.send.nrw/sendnrw/flod

main.go

@@ -24,7 +24,7 @@ import (
 // Redis + Context
 var ctx = context.Background()
 var rdb = redis.NewClient(&redis.Options{
-	Addr: "redis:6379",
+	Addr: "flodredis:6379",
 })
 
 // ──────────────────────────────────────────────────────────────────────────────
@@ -179,7 +179,11 @@ func fetchAndSave(client *http.Client, t target, outDir string) error {
 // Import-Logik
 func importBlocklists() error {
 	client := &http.Client{Timeout: 60 * time.Second}
+<<<<<<< HEAD
 	t := target{Name: "Catalog", URL: os.Getenv("FLOD_IMPORT_URL") + "/lists.json"}
+=======
+	t := target{Name: "Catalog", URL: "http://flodimporter:8080/lists.json"}
+>>>>>>> 95e14caeb60edc10c73d9cb60985caa118ed2a38
 	if err := os.MkdirAll("./lists/", 0o755); err != nil {
 		fmt.Println("creating output dir", err)
 	}