diff --git a/Helpers/join-zt-network.sh b/Helpers/join-zt-network.sh index d55b8e8..69d6281 100644 --- a/Helpers/join-zt-network.sh +++ b/Helpers/join-zt-network.sh @@ -19,15 +19,11 @@ ##-------------------------------## ## SET VARIABLES ## -NETNAME="$1" LOGLOCAL=/Library/Logs/com.purplecomputing.mdm/ -NETID="$2" -APIKEY="$3" - -echo NET NAME $NETNAME -echo NET ID $NETID -echo API KEY $APIKEY +echo NET NAME $ZTNETNAME +echo NET ID $ZTNETID +echo API KEY $ZTAPIKEY ##-------------------------------## ## PREFLIGHT SCRIPT ## ##-------------------------------## @@ -51,9 +47,9 @@ rm -rf /tmp/purple-helpers.sh ##-------------------------------## ## START SCRIPT ## ##-------------------------------## -echo Status: Joining $NETNAME Network >> /var/tmp/depnotify.log -sudo -u $(stat -f "%Su" /dev/console) /usr/local/bin/zerotier-cli join $NETID -/usr/local/bin/zerotier-cli join $NETID +echo Status: Joining $ZTNETNAME Network >> /var/tmp/depnotify.log +sudo -u $(stat -f "%Su" /dev/console) /usr/local/bin/zerotier-cli join $ZTNETID +/usr/local/bin/zerotier-cli join $ZTNETID touch /tmp/ztnetjoined.log sleep 3 # @@ -69,8 +65,8 @@ sleep 3 # CALL API WITH INFO # echo BEFORE CURL -curl -H "Authorization: Bearer $APIKEY" -X POST -d '{"name":"'"%DeviceName%"'","description":"Device authorised through Purple Script.","config":{"authorized":true}}' https://my.zerotier.com/api/network/$NETID/member/$MYID -curl -s -H "Authorization: Bearer $APIKEY" https://my.zerotier.com/api/network/$NETID/member/$MYID +curl -H "Authorization: Bearer $ZTAPIKEY" -X POST -d '{"name":"'"%DeviceName%"'","description":"Device authorised through Purple Script.","config":{"authorized":true}}' https://my.zerotier.com/api/network/$ZTNETID/member/$MYID +curl -s -H "Authorization: Bearer $ZTAPIKEY" https://my.zerotier.com/api/network/$ZTNETID/member/$MYID echo Status: Network authorised, ready to go! >> /var/tmp/depnotify.log touch /tmp/ztnetauthed.log echo AFTER CURL