agent: build without landlock support

shoenig · Nov 4, 2023 · 8d3c068 · 8d3c068
1 parent ec6c48a
commit 8d3c068
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 138 deletions.
diff --git a/agent/config.go b/agent/config.go
@@ -37,6 +37,7 @@ type CoreConfig struct {
 	SuffixDir  string
 	NoDefaults bool
 	Forward    *Forward
+	NoLandlock bool
 }
 
 // Generate a CoreDNS (Caddy) style configuration block as a string.
@@ -82,6 +83,7 @@ func ConfigFromEnv(e env.Environment) *CoreConfig {
 		"DONUT_DNS_UPSTREAM_1":    env.String(&upstream1, false),
 		"DONUT_DNS_UPSTREAM_2":    env.String(&upstream2, false),
 		"DONUT_DNS_UPSTREAM_NAME": env.String(&cc.Forward.ServerName, false),
+		"DONUT_DNS_NO_LANDLOCK":   env.Bool(&cc.NoLandlock, false),
 	}); err != nil {
 		panic(err)
 	}

diff --git a/agent/lockdown.go b/agent/lockdown.go
diff --git a/agent/lockdown_default.go b/agent/lockdown_default.go
diff --git a/agent/lockdown_linux.go b/agent/lockdown_linux.go
diff --git a/agent/lockdown_test.go b/agent/lockdown_test.go
diff --git a/main.go b/main.go
@@ -48,9 +48,6 @@ func setupCC() {
 	// get core config from environment
 	cc := getCC()
 
-	// sandbox donutdns from filesystem (Linux landlock)
-	_ = agent.Lockdown(cc)
-
 	// set plugin core config
 	dnsserver.Port = strconv.Itoa(cc.Port)
 	dnsserver.Directives = directives