Merge pull request #424 from nanobox-io/feature/server

Feature/server

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.1.0 (April 7, 2017)
+
+FEATURES:
+  - Make a major change to the way nanobox runs. When running nanobox now creates a nanobox server
+    This change fixes the quality of life of most users because it should only ask for passwords once
+  - VPN now runs under the server
+  - All administrative commands (dns add, sharing etc.) now run through the server
+
+
 ## 2.0.4 (March 6, 2017)
 
 BUG FIXES:

boxfile.yml

@@ -2,6 +2,9 @@ run.config:
   image: nanobox/build
   engine: golang
   engine.config:
+    # runtime set to the older version until
+    # this issue is fixed https://github.com/Microsoft/go-winio/issues/41
+    runtime: go-1.7
     package: github.com/nanobox-io/nanobox
   dev_packages:
     - py27-awscli

commands/commands.go

@@ -9,8 +9,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/nanobox-io/nanobox/commands/registry"
-	"github.com/nanobox-io/nanobox/util/config"
+	"github.com/nanobox-io/nanobox/commands/server"
 	"github.com/nanobox-io/nanobox/models"
+	"github.com/nanobox-io/nanobox/util/config"
 	"github.com/nanobox-io/nanobox/util/display"
 	"github.com/nanobox-io/nanobox/util/mixpanel"
 	"github.com/nanobox-io/nanobox/util/update"
@@ -39,6 +40,7 @@ var (
 		Short: "",
 		Long:  ``,
 		PersistentPreRun: func(ccmd *cobra.Command, args []string) {
+
 			// report the command usage to mixpanel
 			mixpanel.Report(strings.Replace(ccmd.CommandPath(), "nanobox ", "", 1))
 
@@ -77,7 +79,7 @@ var (
 			if config.CIMode {
 				lumber.Level(lumber.INFO)
 				display.Summary = false
-				display.Level = "info"				
+				display.Level = "info"
 			}
 
 		},
@@ -126,6 +128,7 @@ func init() {
 	NanoboxCmd.AddCommand(DnsCmd)
 	NanoboxCmd.AddCommand(LogCmd)
 	NanoboxCmd.AddCommand(VersionCmd)
+	NanoboxCmd.AddCommand(server.ServerCmd)
 
 	// hidden subcommands
 	NanoboxCmd.AddCommand(EnvCmd)

commands/destroy.go

@@ -38,6 +38,7 @@ func destroyFunc(ccmd *cobra.Command, args []string) {
 
 	if len(args) == 0 {
 		display.CommandErr(env.Destroy(envModel))
+		return
 	}
 
 	_, _, name := helpers.Endpoint(envModel, args, 2)

commands/dns/add.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	// "github.com/nanobox-io/nanobox/commands/steps"
 	"github.com/nanobox-io/nanobox/helpers"
 	"github.com/nanobox-io/nanobox/models"
 	app_dns "github.com/nanobox-io/nanobox/processors/app/dns"

commands/dns/remove.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	// "github.com/nanobox-io/nanobox/commands/steps"
 	"github.com/nanobox-io/nanobox/helpers"
 	"github.com/nanobox-io/nanobox/models"
 	app_dns "github.com/nanobox-io/nanobox/processors/app/dns"

commands/dns/remove_all.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	// "github.com/nanobox-io/nanobox/commands/steps"
 	"github.com/nanobox-io/nanobox/helpers"
 	"github.com/nanobox-io/nanobox/models"
 	app_dns "github.com/nanobox-io/nanobox/processors/app/dns"

commands/env.go

@@ -22,6 +22,5 @@ A namespaced collection of hidded subcommands used primarily as share provisioni
 //
 func init() {
 	// hidden subcommands
-	EnvCmd.AddCommand(env.ShareCmd)
-	EnvCmd.AddCommand(env.BridgeCmd)
+	EnvCmd.AddCommand(env.ServerCmd)
 }

commands/env/server.go

@@ -0,0 +1,67 @@
+package env
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/nanobox-io/nanobox/processors/server"
+	"github.com/nanobox-io/nanobox/util/display"
+)
+
+var (
+
+	// ServerCmd ...
+	ServerCmd = &cobra.Command{
+		Hidden: true,
+		Use:    "server",
+		Short:  "Server control",
+		Long:   ``,
+	}
+
+	// ServerStartCmd ...
+	ServerStartCmd = &cobra.Command{
+		Hidden: true,
+		Use:    "start",
+		Short:  "Start the server",
+		Long:   ``,
+		Run:    serverStartFn,
+	}
+
+	// ServerStopCmd ...
+	ServerStopCmd = &cobra.Command{
+		Hidden: true,
+		Use:    "stop",
+		Short:  "Stop the server",
+		Long:   ``,
+		Run:    serverStopFn,
+	}
+
+	// ServerTeadownCmd ...
+	ServerTeadownCmd = &cobra.Command{
+		Hidden: true,
+		Use:    "teardown",
+		Short:  "Teardown the server",
+		Long:   ``,
+		Run:    serverTeardownFn,
+	}
+)
+
+//
+func init() {
+	ServerCmd.AddCommand(ServerStartCmd)
+	ServerCmd.AddCommand(ServerStopCmd)
+	ServerCmd.AddCommand(ServerTeadownCmd)
+}
+
+func serverStartFn(ccmd *cobra.Command, args []string) {
+	display.CommandErr(server.Setup())
+}
+
+func serverStopFn(ccmd *cobra.Command, args []string) {
+
+	display.CommandErr(server.Stop())
+}
+
+func serverTeardownFn(ccmd *cobra.Command, args []string) {
+
+	display.CommandErr(server.Teardown())
+}

commands/server/registry.go

@@ -0,0 +1,7 @@
+package server
+
+var registeredRPCs = []interface{}{}
+
+func Register(i interface{}) {
+	registeredRPCs = append(registeredRPCs, i)
+}