More comments in generic.bats, config.go should warn about additional config

rfay · rfay · commit 98f2597d3278 · 2026-02-16T20:18:08.000-07:00
diff --git a/docs/tests/generic.bats b/docs/tests/generic.bats
@@ -50,13 +50,13 @@ EOF
   assert_output "FULLURL https://${PROJNAME}.ddev.site"
   assert_success
 
-  echo "#" >&3
-  run docker exec ddev-router curl -sI http://ddev-my-generic-site-web:8000
-  echo "# === curl from inside router (php-server) ===" >&3
-  printf '%s\n' "$output" | sed 's/^/# /' >&3
-  assert_line --partial "200 OK"
+  #echo "#" >&3
+  # run docker exec ddev-router curl -sI http://ddev-my-generic-site-web:8000
+  # echo "# === curl from inside router (php-server) ===" >&3
+  # printf '%s\n' "$output" | sed 's/^/# /' >&3
+  # assert_line --partial "200 OK"
 
-  echo "#" >&3
+  # echo "#" >&3
   # Diagnostic: show traefik config files in volume
   # run docker exec ddev-router ls -la /mnt/ddev-global-cache/traefik/config/
   # echo "# === Traefik config files (router volume) ===" >&3
diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -741,6 +741,21 @@ func (app *DdevApp) CheckCustomConfig() {
 		util.Warning("Using custom Traefik configuration (use `docker logs ddev-router` for troubleshooting): %v", mainProjectTraefikFile)
 		customConfig = true
 	}
+	traefikProjectConfigPath := app.GetConfigPath("traefik/config")
+	if _, err := os.Stat(traefikProjectConfigPath); err == nil {
+		traefikFiles, err := filepath.Glob(filepath.Join(traefikProjectConfigPath, "*.yaml"))
+		util.CheckErr(err)
+		// Remove the main project traefik file from the list
+		traefikFiles = slices.DeleteFunc(traefikFiles, func(f string) bool {
+			return filepath.Base(f) == app.Name+".yaml"
+		})
+		extraTraefikFiles := filterCustomConfigFiles(traefikFiles)
+		// Warn if there are extra config files in project .ddev/traefik/config
+		if len(extraTraefikFiles) > 0 {
+			printableFiles, _ := util.ArrayToReadableOutput(extraTraefikFiles)
+			util.Warning("Extra project traefik config files found in .ddev/traefik/config: %v", printableFiles)
+		}
+	}
 
 	nginxFullConfigPath := app.GetConfigPath("nginx_full/nginx-site.conf")
 	if isCustomConfigFile(nginxFullConfigPath) && app.WebserverType == nodeps.WebserverNginxFPM {
