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

Move flags to coremain (#5865)

Browse Source
This commit is contained in:
David Hadas
2023-01-23 14:27:18 +02:00
committed by GitHub
parent 1732402900
commit 280ef6f405
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/dnsserver/register.go
View File

@@ -1,7 +1,6 @@
package dnsserver package dnsserver
import ( import (
"flag"
"fmt" "fmt"
"net" "net"
"time" "time"
@@ -17,12 +16,7 @@ import (
const serverType = "dns" 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() { func init() {
flag.StringVar(&Port, serverType+".port", DefaultPort, "Default port")
flag.StringVar(&Port, "p", DefaultPort, "Default port")
caddy.RegisterServerType(serverType, caddy.ServerType{ caddy.RegisterServerType(serverType, caddy.ServerType{
Directives: func() []string { return Directives }, Directives: func() []string { return Directives },
DefaultInput: func() caddy.Input { DefaultInput: func() caddy.Input {

3
coremain/run.go
View File

@@ -28,6 +28,9 @@ func init() {
caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader)) caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader))
caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader)) 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.AppName = coreName
caddy.AppVersion = CoreVersion caddy.AppVersion = CoreVersion
} }