Browse Source

committing updated script

afeiszli 4 years ago
parent
commit
ed947cad88
3 changed files with 6 additions and 2 deletions
  1. 3 0
      models/node.go
  2. 2 1
      models/returnNode.go
  3. 1 1
      netclient-install.sh

+ 3 - 0
models/node.go

@@ -26,6 +26,7 @@ type Node struct {
 	Endpoint	string `json:"endpoint" bson:"endpoint" validate:"endpoint_check"`
 	Endpoint	string `json:"endpoint" bson:"endpoint" validate:"endpoint_check"`
 	PostUp	string `json:"postup" bson:"postup"`
 	PostUp	string `json:"postup" bson:"postup"`
 	PreUp	string `json:"preup" bson:"preup"`
 	PreUp	string `json:"preup" bson:"preup"`
+	AllowedIPs	string `json:"preup" bson:"preup"`
 	PersistentKeepalive int32 `json:"persistentkeepalive" bson:"persistentkeepalive" validate: "omitempty,numeric,max=1000"`
 	PersistentKeepalive int32 `json:"persistentkeepalive" bson:"persistentkeepalive" validate: "omitempty,numeric,max=1000"`
 	SaveConfig	*bool `json:"saveconfig" bson:"saveconfig"`
 	SaveConfig	*bool `json:"saveconfig" bson:"saveconfig"`
 	AccessKey	string `json:"accesskey" bson:"accesskey"`
 	AccessKey	string `json:"accesskey" bson:"accesskey"`
@@ -40,6 +41,8 @@ type Node struct {
 	Password	string `json:"password" bson:"password" validate:"password_check"`
 	Password	string `json:"password" bson:"password" validate:"password_check"`
 	Group	string `json:"group" bson:"group" validate:"group_exists"`
 	Group	string `json:"group" bson:"group" validate:"group_exists"`
 	IsPending bool `json:"ispending" bson:"ispending"`
 	IsPending bool `json:"ispending" bson:"ispending"`
+	IsGateway bool `json:"isgateway" bson:"isgateway"`
+	GatewayRange string `json:"gatewayrange" bson:"gatewayrange"`
 	PostChanges string `json:"postchanges" bson:"postchanges"`
 	PostChanges string `json:"postchanges" bson:"postchanges"`
 }
 }
 
 

+ 2 - 1
models/returnNode.go

@@ -18,7 +18,8 @@ type ReturnNode struct {
 	Interface	string `json:"interface" bson:"interface"`
 	Interface	string `json:"interface" bson:"interface"`
 	Group	string `json:"group" bson:"group"`
 	Group	string `json:"group" bson:"group"`
 	IsPending	*bool `json:"ispending" bson:"ispending"`
 	IsPending	*bool `json:"ispending" bson:"ispending"`
+	IsGateway	*bool `json:"isgateway" bson:"ispending"`
+	GatewayRange	string `json:"gatewayrange" bson:"gatewayrange"`
         LocalAddress    string `json:"localaddress" bson:"localaddress" validate:"localaddress_check"`
         LocalAddress    string `json:"localaddress" bson:"localaddress" validate:"localaddress_check"`
         ExpirationDateTime      int64 `json:"expdatetime" bson:"expdatetime"`
         ExpirationDateTime      int64 `json:"expdatetime" bson:"expdatetime"`
-        CheckInInterval int32 `json:"checkininterval" bson:"checkininterval"`
 }
 }

+ 1 - 1
netclient-install.sh

@@ -7,7 +7,7 @@ set -e
 
 
 
 
 
 
-wget -O netclient https://github.com/gravitl/netmaker/releases/download/v0.1/netclient netclient
+wget -O netclient https://github.com/gravitl/netmaker/releases/download/latest/netclient netclient
 chmod +x netclient
 chmod +x netclient
 sudo ./netclient -c install -s $SERVER_URL -g $NET_NAME -k $KEY
 sudo ./netclient -c install -s $SERVER_URL -g $NET_NAME -k $KEY
 rm -f netclient
 rm -f netclient