diff options
| author |  David Hadas <david.hadas@gmail.com>
| 2023-01-23 14:27:18 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-01-23 04:27:18 -0800 |
| commit | 280ef6f405f29b56b23addab9ef785cc24699faa (patch) | |
| tree | 2a759a8fb6f3612eb13bb7468912e47e4c12c652 | |
| parent | 173240290091640e49e3bed19e93f964c232be89 (diff) | |
| download | coredns-280ef6f405f29b56b23addab9ef785cc24699faa.tar.gz coredns-280ef6f405f29b56b23addab9ef785cc24699faa.tar.zst coredns-280ef6f405f29b56b23addab9ef785cc24699faa.zip | |
Move flags to coremain (#5865)
| -rw-r--r-- | core/dnsserver/register.go | 6 | ||||
| -rw-r--r-- | coremain/run.go | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/dnsserver/register.go b/core/dnsserver/register.go index 2b673cab3..8de559066 100644 --- a/core/dnsserver/register.go +++ b/core/dnsserver/register.go @@ -1,7 +1,6 @@ package dnsserver import ( - "flag" "fmt" "net" "time" @@ -17,12 +16,7 @@ import ( const serverType = "dns" -// Any flags defined here, need to be namespaced to the serverType other -// wise they potentially clash with other server types. func init() { - flag.StringVar(&Port, serverType+".port", DefaultPort, "Default port") - flag.StringVar(&Port, "p", DefaultPort, "Default port") - caddy.RegisterServerType(serverType, caddy.ServerType{ Directives: func() []string { return Directives }, DefaultInput: func() caddy.Input { diff --git a/coremain/run.go b/coremain/run.go index 5a9d68988..6604a4edc 100644 --- a/coremain/run.go +++ b/coremain/run.go @@ -28,6 +28,9 @@ func init() { caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader)) caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader)) + flag.StringVar(&dnsserver.Port, serverType+".port", dnsserver.DefaultPort, "Default port") + flag.StringVar(&dnsserver.Port, "p", dnsserver.DefaultPort, "Default port") + caddy.AppName = coreName caddy.AppVersion = CoreVersion } |