From 6e7813f2f8789717ec21eca1cb736b95b69c7471 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 15 Feb 2016 11:15:38 +0100
Subject: [PATCH] feat(build): move grafana into grafana-server

---
 build.go                                  | 2 +-
 main.go => pkg/cmd/grafana-server/main.go | 3 +--
 pkg/cmd/{ => grafana-server}/web.go       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename main.go => pkg/cmd/grafana-server/main.go (98%)
 rename pkg/cmd/{ => grafana-server}/web.go (99%)

diff --git a/build.go b/build.go
index ac7707f76fc..a05b27b3008 100644
--- a/build.go
+++ b/build.go
@@ -63,7 +63,7 @@ func main() {
 			setup()
 
 		case "build":
-			pkg := "."
+			pkg := "./pkg/cmd/grafana-server"
 			clean()
 			build(pkg, []string{})
 
diff --git a/main.go b/pkg/cmd/grafana-server/main.go
similarity index 98%
rename from main.go
rename to pkg/cmd/grafana-server/main.go
index 4a052ea4934..d78b8f700ff 100644
--- a/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -12,7 +12,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/grafana/grafana/pkg/cmd"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/metrics"
@@ -74,7 +73,7 @@ func main() {
 		go metrics.StartUsageReportLoop()
 	}
 
-	cmd.StartServer()
+	StartServer()
 	exitChan <- 0
 }
 
diff --git a/pkg/cmd/web.go b/pkg/cmd/grafana-server/web.go
similarity index 99%
rename from pkg/cmd/web.go
rename to pkg/cmd/grafana-server/web.go
index 61534e7d346..0d78de0daae 100644
--- a/pkg/cmd/web.go
+++ b/pkg/cmd/grafana-server/web.go
@@ -1,7 +1,7 @@
 // Copyright 2014 Unknwon
 // Copyright 2014 Torkel Ödegaard
 
-package cmd
+package main
 
 import (
 	"fmt"