diff options
author | 2016-04-28 11:07:44 -0700 | |
---|---|---|
committer | 2016-04-28 19:07:44 +0100 | |
commit | e34280e7af517443a8f95e76247cf614c37fdbf6 (patch) | |
tree | f911eb03ff8e71d7f4c245e0694d3b47e2198734 /core/config.go | |
parent | bba63f776518347f53697160fce638419c3fe813 (diff) | |
download | coredns-e34280e7af517443a8f95e76247cf614c37fdbf6.tar.gz coredns-e34280e7af517443a8f95e76247cf614c37fdbf6.tar.zst coredns-e34280e7af517443a8f95e76247cf614c37fdbf6.zip |
Clean up remove caddy refs (#139)
* Changed reference to Caddy over to CoreDNS
* Removing references to caddy
* Fixed misleading error message to reference coredns
* Cleaning up references to caddy
* Adding clean and deps targets
Muscle memory is resulting in "make clean" commands.
* Adding test target to makefile
* More "Caddy" cleanup
Diffstat (limited to 'core/config.go')
-rw-r--r-- | core/config.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/config.go b/core/config.go index 5cdaacee6..eea099a70 100644 --- a/core/config.go +++ b/core/config.go @@ -23,7 +23,7 @@ func loadConfigsUpToIncludingTLS(filename string, input io.Reader) ([]server.Con var configs []server.Config // Each server block represents similar hosts/addresses, since they - // were grouped together in the Caddyfile. + // were grouped together in the Corefile. serverBlocks, err := parse.ServerBlocks(filename, input, true) if err != nil { return nil, nil, 0, err @@ -304,12 +304,12 @@ func validDirective(d string) bool { return false } -// DefaultInput returns the default Caddyfile input +// DefaultInput returns the default Corefile input // to use when it is otherwise empty or missing. // It uses the default host and port and root. -func DefaultInput() CaddyfileInput { +func DefaultInput() CorefileInput { port := Port - return CaddyfileInput{ + return CorefileInput{ Contents: []byte(fmt.Sprintf("%s:%s\nroot %s", Host, port, Root)), } } |