From 8689a2f135a7e3c114435acf51625a9401a3318c Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sat, 30 Sep 2017 06:41:35 -0700
Subject: [PATCH] database: move to internal/

---
 .gitignore                                 | 3 ++-
 cmd/route/main.go                          | 2 +-
 {database => internal/database}/boltdb.go  | 0
 {database => internal/database}/cert.go    | 0
 {database => internal/database}/route.go   | 0
 {database => internal/database}/storage.go | 0
 {database => internal/database}/token.go   | 0
 mage.go                                    | 3 ---
 server/common.go                           | 2 +-
 server/server.go                           | 2 +-
 server/storage.go                          | 2 +-
 11 files changed, 6 insertions(+), 8 deletions(-)
 rename {database => internal/database}/boltdb.go (100%)
 rename {database => internal/database}/cert.go (100%)
 rename {database => internal/database}/route.go (100%)
 rename {database => internal/database}/storage.go (100%)
 rename {database => internal/database}/token.go (100%)

diff --git a/.gitignore b/.gitignore
index 952c29d..562517b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 .env
 var
-bin
\ No newline at end of file
+bin
+.#*
\ No newline at end of file
diff --git a/cmd/route/main.go b/cmd/route/main.go
index 242b218..753b7cc 100644
--- a/cmd/route/main.go
+++ b/cmd/route/main.go
@@ -13,7 +13,7 @@ import (
 
 	"go.uber.org/atomic"
 
-	"git.xeserv.us/xena/route/database"
+	"git.xeserv.us/xena/route/internal/database"
 	"git.xeserv.us/xena/route/lib/routecrypto"
 	proto "git.xeserv.us/xena/route/proto"
 	"github.com/Xe/ln"
diff --git a/database/boltdb.go b/internal/database/boltdb.go
similarity index 100%
rename from database/boltdb.go
rename to internal/database/boltdb.go
diff --git a/database/cert.go b/internal/database/cert.go
similarity index 100%
rename from database/cert.go
rename to internal/database/cert.go
diff --git a/database/route.go b/internal/database/route.go
similarity index 100%
rename from database/route.go
rename to internal/database/route.go
diff --git a/database/storage.go b/internal/database/storage.go
similarity index 100%
rename from database/storage.go
rename to internal/database/storage.go
diff --git a/database/token.go b/internal/database/token.go
similarity index 100%
rename from database/token.go
rename to internal/database/token.go
diff --git a/mage.go b/mage.go
index fb711c8..024541d 100644
--- a/mage.go
+++ b/mage.go
@@ -48,9 +48,6 @@ func Build() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	err := os.Mkdir("bin", 0777)
-	qod.ANE(err)
-
 	d := filepath.Join(wd, "./bin")
 
 	for _, pkg := range []string{"helloserver", "httpagent", "route", "routed"} {
diff --git a/server/common.go b/server/common.go
index 5346242..24aca99 100644
--- a/server/common.go
+++ b/server/common.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"git.xeserv.us/xena/route/database"
+	"git.xeserv.us/xena/route/internal/database"
 	"github.com/Xe/ln"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/server/server.go b/server/server.go
index 551cc0b..b2295a0 100644
--- a/server/server.go
+++ b/server/server.go
@@ -8,7 +8,7 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"git.xeserv.us/xena/route/database"
+	"git.xeserv.us/xena/route/internal/database"
 	"git.xeserv.us/xena/route/lib/tun2"
 	proto "git.xeserv.us/xena/route/proto"
 	"github.com/mtneug/pkg/ulid"
diff --git a/server/storage.go b/server/storage.go
index aa90123..175a1cf 100644
--- a/server/storage.go
+++ b/server/storage.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"git.xeserv.us/xena/route/database"
+	"git.xeserv.us/xena/route/internal/database"
 	"git.xeserv.us/xena/route/lib/tun2"
 )