Add apache second docroot example, fixes #2323 (#2324)

ddev · Jun 23, 2020 · 31b4523 · 31b4523
1 parent 8004dc7
commit 31b4523
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 7 deletions.
diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go
@@ -953,11 +953,12 @@ func (app *DdevApp) Start() error {
 // GenerateWebserverConfig generates the default nginx and apache config files
 func (app *DdevApp) GenerateWebserverConfig() error {
 	var items = map[string]string{
-		"nginx":                        app.GetConfigPath(filepath.Join("nginx_full", "nginx-site.conf")),
-		"apache":                       app.GetConfigPath(filepath.Join("apache", "apache-site.conf")),
-		"nginx_second_docroot_example": app.GetConfigPath(filepath.Join("nginx_full", "seconddocroot.conf.example")),
-		"README.nginx_full.txt":        app.GetConfigPath(filepath.Join("nginx_full", "README.nginx_full.txt")),
-		"README.apache.txt":            app.GetConfigPath(filepath.Join("apache", "README.apache.txt")),
+		"nginx":                         app.GetConfigPath(filepath.Join("nginx_full", "nginx-site.conf")),
+		"apache":                        app.GetConfigPath(filepath.Join("apache", "apache-site.conf")),
+		"nginx_second_docroot_example":  app.GetConfigPath(filepath.Join("nginx_full", "seconddocroot.conf.example")),
+		"README.nginx_full.txt":         app.GetConfigPath(filepath.Join("nginx_full", "README.nginx_full.txt")),
+		"README.apache.txt":             app.GetConfigPath(filepath.Join("apache", "README.apache.txt")),
+		"apache_second_docroot_example": app.GetConfigPath(filepath.Join("apache", "seconddocroot.conf.example")),
 	}
 	for t, configPath := range items {
 		err := os.MkdirAll(filepath.Dir(configPath), 0755)