From 822ec9060641837c8af66b6a403f7a13c45b3f7f Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Wed, 29 Oct 2014 11:41:58 +0000 Subject: [PATCH] Rename weavedns package to nameserver, and fix up --- nameserver/dns.go | 2 +- nameserver/http.go | 2 +- nameserver/http_test.go | 2 +- nameserver/if_utils.go | 2 +- nameserver/logging.go | 2 +- nameserver/mdns_client.go | 2 +- nameserver/mdns_client_test.go | 2 +- nameserver/mdns_server.go | 2 +- nameserver/mdns_server_test.go | 2 +- nameserver/server.go | 2 +- nameserver/testing_utils.go | 2 +- nameserver/updater.go | 2 +- nameserver/zone.go | 2 +- nameserver/zone_test.go | 2 +- weavedns/Makefile | 4 ++-- weavedns/main.go | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nameserver/dns.go b/nameserver/dns.go index e4f3daa9..bd0466e0 100644 --- a/nameserver/dns.go +++ b/nameserver/dns.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/http.go b/nameserver/http.go index cecc1d91..b25b9204 100644 --- a/nameserver/http.go +++ b/nameserver/http.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "errors" diff --git a/nameserver/http_test.go b/nameserver/http_test.go index 09144c68..9e41dbd8 100644 --- a/nameserver/http_test.go +++ b/nameserver/http_test.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "fmt" diff --git a/nameserver/if_utils.go b/nameserver/if_utils.go index 051c57f6..2159b125 100644 --- a/nameserver/if_utils.go +++ b/nameserver/if_utils.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "fmt" diff --git a/nameserver/logging.go b/nameserver/logging.go index ccd96f30..03c1529b 100644 --- a/nameserver/logging.go +++ b/nameserver/logging.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "io" diff --git a/nameserver/mdns_client.go b/nameserver/mdns_client.go index db5f134a..9bf9dda2 100644 --- a/nameserver/mdns_client.go +++ b/nameserver/mdns_client.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go index ce029865..2e0206a7 100644 --- a/nameserver/mdns_client_test.go +++ b/nameserver/mdns_client_test.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go index 0e8fdf85..7cc25fae 100644 --- a/nameserver/mdns_server.go +++ b/nameserver/mdns_server.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/mdns_server_test.go b/nameserver/mdns_server_test.go index d3ecff2d..51fd5f14 100644 --- a/nameserver/mdns_server_test.go +++ b/nameserver/mdns_server_test.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/server.go b/nameserver/server.go index 26ca3672..bd492a57 100644 --- a/nameserver/server.go +++ b/nameserver/server.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "fmt" diff --git a/nameserver/testing_utils.go b/nameserver/testing_utils.go index 0b7c37cd..0a4835ae 100644 --- a/nameserver/testing_utils.go +++ b/nameserver/testing_utils.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "reflect" diff --git a/nameserver/updater.go b/nameserver/updater.go index c0d71f04..9d73090b 100644 --- a/nameserver/updater.go +++ b/nameserver/updater.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/fsouza/go-dockerclient" diff --git a/nameserver/zone.go b/nameserver/zone.go index 7e4c8a42..97c88cd5 100644 --- a/nameserver/zone.go +++ b/nameserver/zone.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "github.com/miekg/dns" diff --git a/nameserver/zone_test.go b/nameserver/zone_test.go index bbe3a9e8..3ada988c 100644 --- a/nameserver/zone_test.go +++ b/nameserver/zone_test.go @@ -1,4 +1,4 @@ -package weavedns +package nameserver import ( "net" diff --git a/weavedns/Makefile b/weavedns/Makefile index fa46ea64..237ac97e 100644 --- a/weavedns/Makefile +++ b/weavedns/Makefile @@ -2,8 +2,8 @@ all: server-image -weavedns: ../server/*.go ../main.go - go get -tags netgo ../ && go build -tags netgo -ldflags '-linkmode external -extldflags "-static"' -o $@ -v ../ +weavedns: ../nameserver/*.go ./main.go + go get -tags netgo && go build -tags netgo -ldflags '-linkmode external -extldflags "-static"' -o $@ -v .PHONY: server-image diff --git a/weavedns/main.go b/weavedns/main.go index 2db52c04..79c8a51a 100644 --- a/weavedns/main.go +++ b/weavedns/main.go @@ -2,7 +2,7 @@ package main import ( "flag" - "github.com/zettio/weavedns/server" + weavedns "github.com/zettio/weavedns/nameserver" "io/ioutil" "net" "os"