fix: global project_tld should default to 'ddev.site', not empty, fixes

ddev#4290
rfay · Dec 14, 2023 · ffc606e · ffc606e
1 parent 19f3e64
commit ffc606e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -473,7 +473,7 @@ func (app *DdevApp) ValidateConfig() error {
 	for _, hn := range app.GetHostnames() {
 		// If they have provided "*.<hostname>" then ignore the *. part.
 		hn = strings.TrimPrefix(hn, "*.")
-		if hn == "ddev.site" {
+		if hn == nodeps.DdevDefaultTLD {
 			return fmt.Errorf("wildcarding the full hostname or using 'ddev.site' as FQDN for the project %s is not allowed because other projects would not work in that case", app.Name)
 		}
 		if !hostRegex.MatchString(hn) {

diff --git a/pkg/globalconfig/global_config.go b/pkg/globalconfig/global_config.go
@@ -89,6 +89,7 @@ func New() GlobalConfig {
 		MkcertCARoot:                 readCAROOT(),
 		ProjectList:                  make(map[string]*ProjectInfo),
 		TraefikMonitorPort:           nodeps.TraefikMonitorPortDefault,
+		ProjectTldGlobal:             nodeps.DdevDefaultTLD,
 	}
 
 	return cfg