aboutsummaryrefslogtreecommitdiff
path: root/plugin/grpc/setup.go
diff options
context:
space:
mode:
authorGravatar Marius Kimmina <38843153+mariuskimmina@users.noreply.github.com> 2023-06-01 14:56:57 +0200
committerGravatar GitHub <noreply@github.com> 2023-06-01 08:56:57 -0400
commitd0375bc0269eccb1966ccf38a9b43263d551dee4 (patch)
tree64d3d1fff583d6c4570c017cb745f55e95f1a32c /plugin/grpc/setup.go
parentcf87aa92bd21854f95d87b6cacfe758724083a85 (diff)
downloadcoredns-d0375bc0269eccb1966ccf38a9b43263d551dee4.tar.gz
coredns-d0375bc0269eccb1966ccf38a9b43263d551dee4.tar.zst
coredns-d0375bc0269eccb1966ccf38a9b43263d551dee4.zip
plugin/tls: respect the path specified by root plugin (#5944)
Signed-off-by: Marius Kimmina <mar.kimmina@gmail.com>
Diffstat (limited to 'plugin/grpc/setup.go')
-rw-r--r--plugin/grpc/setup.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugin/grpc/setup.go b/plugin/grpc/setup.go
index 48a3d2c31..eead54f58 100644
--- a/plugin/grpc/setup.go
+++ b/plugin/grpc/setup.go
@@ -3,6 +3,7 @@ package grpc
import (
"crypto/tls"
"fmt"
+ "path/filepath"
"github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver"
@@ -110,7 +111,11 @@ func parseBlock(c *caddy.Controller, g *GRPC) error {
if len(args) > 3 {
return c.ArgErr()
}
-
+ for i := range args {
+ if !filepath.IsAbs(args[i]) && dnsserver.GetConfig(c).Root != "" {
+ args[i] = filepath.Join(dnsserver.GetConfig(c).Root, args[i])
+ }
+ }
tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...)
if err != nil {
return err
lizer Unnamed repository; edit this file 'description' to name the repository.
aboutsummaryrefslogtreecommitdiff
path: root/integration/bunjs-only-snippets/bun.lockb (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2022-06-22types for `bun:jsc`Gravatar Jarred Sumner 2-1/+37
2022-06-22Slightly customize the `events` polyfill so it uses ESMGravatar Jarred Sumner 1-1/+522
2022-06-22Fix memory bugs in escapeHTML & arrayBufferToStringGravatar Jarred Sumner 1-65/+61