gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-10 00:30:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #263 from gravitl/v0.7.3

Browse source 
V0.7.3
This commit is contained in:
dcarns 2021-08-25 18:04:44 -04:00 • committed by GitHub
commit d2290db1a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/extClientHttpController.go
View file

@ -189,21 +189,21 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
config := fmt.Sprintf(`[Interface] config := fmt.Sprintf(`[Interface]
Address = %s Address = %s
PrivateKey = %s PrivateKey = %s
%s
[Peer] [Peer]
PublicKey = %s PublicKey = %s
AllowedIPs = %s AllowedIPs = %s
Endpoint = %s Endpoint = %s
%s %s
%s
`, client.Address+"/32", `, client.Address+"/32",
client.PrivateKey, client.PrivateKey,
defaultDNS,
gwnode.PublicKey, gwnode.PublicKey,
newAllowedIPs, newAllowedIPs,
gwendpoint, gwendpoint,
keepalive, keepalive)
defaultDNS)
if params["type"] == "qr" { if params["type"] == "qr" {
bytes, err := qrcode.Encode(config, qrcode.Medium, 220) bytes, err := qrcode.Encode(config, qrcode.Medium, 220)

2
test/nodecreate.sh
View file

@ -3,7 +3,7 @@
PUBKEY="DM5qhLAE20EG9BbfBEger+Ac9D2NDOwCtY1rbYDLf34=" PUBKEY="DM5qhLAE20EG9BbfBEger+Ac9D2NDOwCtY1rbYDLf34="
IPADDR="70.173.21.212" IPADDR="70.173.21.212"
MACADDRESS="59:23:9c:f2:e4:49" MACADDRESS="59:23:9c:f2:e4:49"
ACCESSKEY="Gsl6FKOjWi2qPGXy" ACCESSKEY="DYrXDkNuXC3XQ27J"
PASSWORD="ppppppp" PASSWORD="ppppppp"
generate_post_json () generate_post_json ()