mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
fixed spacing
This commit is contained in:
parent
5d9637deae
commit
7c1e5a6d86
|
@ -55,33 +55,25 @@ func CreateServerToken(netID string) (string, error) {
|
|||
}
|
||||
|
||||
var accessToken models.AccessToken
|
||||
servervals := models.ServerConfig{
|
||||
APIConnString: "127.0.0.1" + servercfg.GetAPIPort(),
|
||||
GRPCConnString: "127.0.0.1" + servercfg.GetGRPCPort(),
|
||||
GRPCSSL: "off",
|
||||
servervals := models.ServerConfig{
|
||||
APIConnString: "127.0.0.1" + servercfg.GetAPIPort(),
|
||||
GRPCConnString: "127.0.0.1" + servercfg.GetGRPCPort(),
|
||||
GRPCSSL: "off",
|
||||
}
|
||||
accessToken.ServerConfig = servervals
|
||||
accessToken.ClientConfig.Network = netID
|
||||
accessToken.ClientConfig.Key = GenKey()
|
||||
accessToken.ServerConfig = servervals
|
||||
accessToken.ClientConfig.Network = netID
|
||||
accessToken.ClientConfig.Key = GenKey()
|
||||
|
||||
accesskey.Name = GenKeyName()
|
||||
accesskey.Value = GenKey()
|
||||
accesskey.Uses = 1
|
||||
|
||||
<<<<<<< HEAD
|
||||
privAddr := ""
|
||||
if *network.IsLocal {
|
||||
privAddr = network.LocalRange
|
||||
tokenjson, err := json.Marshal(accessToken)
|
||||
if err != nil {
|
||||
return accesskey.AccessString, err
|
||||
}
|
||||
accessstringdec := address + "|" + address + "|" + address + "|" + netID + "|" + accesskey.Value + "|" + privAddr
|
||||
=======
|
||||
tokenjson, err := json.Marshal(accessToken)
|
||||
if err != nil {
|
||||
return accesskey.AccessString, err
|
||||
}
|
||||
>>>>>>> 35826caa6fb2dfe3dbe65d25799d243f5a444999
|
||||
|
||||
accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(tokenjson))
|
||||
accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(tokenjson))
|
||||
|
||||
network.AccessKeys = append(network.AccessKeys, accesskey)
|
||||
|
||||
|
|
Loading…
Reference in a new issue