From a1cfb70fa78ce900f622feaacac3f0ffaf76be1b Mon Sep 17 00:00:00 2001 From: afeiszli Date: Wed, 9 Feb 2022 10:33:07 -0500 Subject: [PATCH 1/2] changing link --- scripts/nm-quick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 80aeb3f2..7b27c02a 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -137,7 +137,7 @@ sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile echo "setting mosquitto.conf..." -wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravil/netmaker/master/docker/mosquitto.conf +wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf echo "setting docker-compose..." From 8276fb4c636e556be029f203c7123e2996d8e008 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Wed, 9 Feb 2022 10:44:36 -0500 Subject: [PATCH 2/2] fixing script --- scripts/nm-quick.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 7b27c02a..da7ab414 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -190,7 +190,7 @@ sleep 2 echo "configuring netmaker server as ingress gateway" curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' localhost:8081/api/nodes/default) -SERVER_ID=$(jq -r '.[0].macaddress' <<< ${curlresponse}) +SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) curl -o /dev/null -s -X POST -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' localhost:8081/api/nodes/default/$SERVER_ID/createingress @@ -224,7 +224,7 @@ sleep 2 echo "configuring netmaker server as vpn inlet..." curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' localhost:8081/api/nodes/vpn) -SERVER_ID=$(jq -r '.[0].macaddress' <<< ${curlresponse}) +SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) curl -s -o /dev/null -X POST -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' localhost:8081/api/nodes/vpn/$SERVER_ID/createingress @@ -240,7 +240,7 @@ echo "configuring netmaker server vpn gateway..." echo "gateway iface: $GATEWAY_IFACE" curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' localhost:8081/api/nodes/vpn) -SERVER_ID=$(jq -r '.[0].macaddress' <<< ${curlresponse}) +SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) EGRESS_JSON=$( jq -n \ --arg gw "$GATEWAY_IFACE" \