Skip to content

C
Coredns
Commit 3cef6674 authored by Manuel Stocker's avatar Manuel Stocker Committed by Miek Gieben
Browse files
Options

plugin/dnssec: Add root support (#2195)

parent 6d2bc0a8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
plugin/dnssec/setup.go
View file @ 3cef6674
...@@ -2,6 +2,7 @@ package dnssec ...@@ -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) { ...@@ -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) { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment