From 4f3a2bc3c8fae1f4c09e69ce183ae4691637ab29 Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Wed, 2 Jun 2021 16:18:42 +0000
Subject: [PATCH] netmaker default network add --fixed

---
 compose/docker-compose.yml           | 2 +-
 controllers/networkHttpController.go | 1 -
 controllers/nodeGrpcController.go    | 3 ---
 functions/helpers.go                 | 3 ---
 netclient/config/config.go           | 2 +-
 netclient/functions/join.go          | 3 +--
 netclient/main.go                    | 6 ------
 7 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 38c21bc7..33177418 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     ports:
       - "80:80"
     environment:
-      BACKEND_URL: "http://HOST_IP:8081"
+      BACKEND_URL: "http://3.236.59.246:8081"
   coredns:
     depends_on:
       - netmaker 
diff --git a/controllers/networkHttpController.go b/controllers/networkHttpController.go
index 09201945..4e5f3886 100644
--- a/controllers/networkHttpController.go
+++ b/controllers/networkHttpController.go
@@ -650,7 +650,6 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	// Create filter
 	filter := bson.M{"netid": network.NetID}
 	// Read update model from body request
-	fmt.Println("Adding key to " + network.NetID)
 	// prepare update model.
 	update := bson.D{
 		{"$set", bson.D{
diff --git a/controllers/nodeGrpcController.go b/controllers/nodeGrpcController.go
index e5bbea27..0fbe6d4b 100644
--- a/controllers/nodeGrpcController.go
+++ b/controllers/nodeGrpcController.go
@@ -3,7 +3,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"log"
 	"github.com/gravitl/netmaker/functions"
 	nodepb "github.com/gravitl/netmaker/grpc"
 	"github.com/gravitl/netmaker/models"
@@ -161,8 +160,6 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.CreateNo
 	network, err := functions.GetParentNetwork(node.Network)
 	if err != nil {
 		return nil, status.Errorf(codes.NotFound, fmt.Sprintf("Could not find network: %v", err))
-	} else {
-		log.Println("Creating node in network " + network.NetID)
 	}
 
 	if !validKey {
diff --git a/functions/helpers.go b/functions/helpers.go
index 7133df5d..d95d4c52 100644
--- a/functions/helpers.go
+++ b/functions/helpers.go
@@ -57,9 +57,6 @@ func CreateServerToken(netID string) (string, error) {
 	// Create filter
 	filter := bson.M{"netid": netID}
 
-	// Read update model from body request
-	fmt.Println("Adding key to " + network.NetID)
-
 	// prepare update model.
 	update := bson.D{
 		{"$set", bson.D{
diff --git a/netclient/config/config.go b/netclient/config/config.go
index df15e2e8..df3266ac 100644
--- a/netclient/config/config.go
+++ b/netclient/config/config.go
@@ -381,7 +381,7 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, error){
                 cfg.Network = tokenvals[3]
                 cfg.Node.Network = tokenvals[3]
                 cfg.Server.AccessKey = tokenvals[4]
-                if len(tokenvals) > 5 {
+                if len(tokenvals) > 4 {
 			cfg.Node.LocalRange = tokenvals[5]
 		}
 		if c.String("grpcserver") != "" {
diff --git a/netclient/functions/join.go b/netclient/functions/join.go
index 7893cd18..fe6dc37a 100644
--- a/netclient/functions/join.go
+++ b/netclient/functions/join.go
@@ -23,7 +23,7 @@ func JoinNetwork(cfg config.ClientConfig) error {
 
 	hasnet := local.HasNetwork(cfg.Network)
 	if hasnet {
-		   err := errors.New("ALREADY_INSTALLED. Netclient appears to already be installed for cfg.Network " + cfg.Network + ". To re-install, please remove by executing 'sudo netclient -c remove -n " + cfg.Network + "'. Then re-run the install command.")
+		   err := errors.New("ALREADY_INSTALLED. Netclient appears to already be installed for " + cfg.Network + ". To re-install, please remove by executing 'sudo netclient leave -n " + cfg.Network + "'. Then re-run the install command.")
 		return err
 	}
 	log.Println("attempting to joining " + cfg.Network + " at " + cfg.Server.GRPCAddress)
@@ -111,7 +111,6 @@ func JoinNetwork(cfg config.ClientConfig) error {
 		}
         } else {
                 cfg.Node.Endpoint = cfg.Node.Endpoint
-		fmt.Println("Endpoint set in config. Setting to address: " + cfg.Node.Endpoint)
         }
 	if cfg.Node.PrivateKey == "" {
 		privatekey, err := wgtypes.GeneratePrivateKey()
diff --git a/netclient/main.go b/netclient/main.go
index ea145a2b..137399b4 100644
--- a/netclient/main.go
+++ b/netclient/main.go
@@ -143,12 +143,6 @@ func main() {
             Value: "",
             Usage: "Local Range if network is local, for instance 192.168.1.0/24.",
         },
-        &cli.StringFlag{
-            Name:  "roaming",
-            EnvVars: []string{"NETCLIENT_ROAMING"},
-            Value: "on",
-            Usage: "Checks for changes in IP address during updates if 'on'. Stays static if 'off'. On by default.",
-        },
         &cli.StringFlag{
             Name:  "dns",
             EnvVars: []string{"NETCLIENT_DNS"},