mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 23:36:18 +08:00
netmaker default network add --fixed
This commit is contained in:
parent
f757b9e2c8
commit
4f3a2bc3c8
|
@ -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
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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") != "" {
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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"},
|
||||
|
|
Loading…
Reference in a new issue