Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/dnssec: Add root support (#2195)

Browse Source
This commit is contained in:
Manuel Stocker
2018-10-13 19:49:55 +02:00
committed by Miek Gieben
parent 6d2bc0a8f2
commit 3cef6674e9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/dnssec/setup.go
View File

@@ -2,6 +2,7 @@ package dnssec
import ( import (
"fmt" "fmt"
"path"
"strconv" "strconv"
"strings" "strings"
@@ -113,6 +114,7 @@ func dnssecParse(c *caddy.Controller) ([]string, []*DNSKEY, int, error) {
func keyParse(c *caddy.Controller) ([]*DNSKEY, error) { func keyParse(c *caddy.Controller) ([]*DNSKEY, error) {
keys := []*DNSKEY{} keys := []*DNSKEY{}
config := dnsserver.GetConfig(c)
if !c.NextArg() { if !c.NextArg() {
return nil, c.ArgErr() return nil, c.ArgErr()
@@ -133,6 +135,9 @@ func keyParse(c *caddy.Controller) ([]*DNSKEY, error) {
if strings.HasSuffix(k, ".private") { if strings.HasSuffix(k, ".private") {
base = k[:len(k)-8] base = k[:len(k)-8]
} }
if !path.IsAbs(base) && config.Root != "" {
base = path.Join(config.Root, base)
}
k, err := ParseKeyFile(base+".key", base+".private") k, err := ParseKeyFile(base+".key", base+".private")
if err != nil { if err != nil {
return nil, err return nil, err