Create include.conf in etc directory

qdm12 · qdm12 · commit 29fbb7a3e2f0 · 2021-01-02T20:28:14.000Z
diff --git a/pkg/unbound/conf.go b/pkg/unbound/conf.go
@@ -88,7 +88,7 @@ func generateUnboundConf(settings models.Settings,
 		"port":           strconv.Itoa(int(settings.ListeningPort)),
 		// Other
 		"username": `"` + username + `"`,
-		"include":  includeConfFilename,
+		"include":  `"` + filepath.Join(unboundDir, includeConfFilename) + `"`,
 	}
 
 	for _, provider := range settings.Providers {
diff --git a/pkg/unbound/conf_test.go b/pkg/unbound/conf_test.go
@@ -52,7 +52,7 @@ server:
   harden-referral-path: yes
   hide-identity: yes
   hide-version: yes
-  include: include.conf
+  include: "/unbound/include.conf"
   interface: 0.0.0.0
   key-cache-size: 32m
   key-cache-slabs: 4

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func generateUnboundConf(settings models.Settings,`
`88`	`88`	`"port": strconv.Itoa(int(settings.ListeningPort)),`
`89`	`89`	`// Other`
`90`	`90`	"username": `"` + username + `"`,
`91`		`- "include": includeConfFilename,`
	`91`	+ "include": `"` + filepath.Join(unboundDir, includeConfFilename) + `"`,
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`for _, provider := range settings.Providers {`