Rename weavedns package to nameserver, and fix up

nameserver/dns.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/http.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"errors"

nameserver/http_test.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"fmt"

nameserver/if_utils.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"fmt"

nameserver/logging.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"io"

nameserver/mdns_client.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/mdns_client_test.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/mdns_server.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/mdns_server_test.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/server.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"fmt"

nameserver/testing_utils.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"reflect"

nameserver/updater.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/fsouza/go-dockerclient"

nameserver/zone.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"github.com/miekg/dns"

nameserver/zone_test.go

@@ -1,4 +1,4 @@
-package weavedns
+package nameserver
 
 import (
 	"net"

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
 

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"