Merge pull request #874 from gravitl/v0.11.1

V0.11.1

controllers/node.go

@@ -302,7 +302,7 @@ func getAllNodes(w http.ResponseWriter, r *http.Request) {
 	//Return all the nodes in JSON format
 	logger.Log(3, r.Header.Get("user"), "fetched all nodes they have access to")
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(filterCommsNodes(nodes))
+	json.NewEncoder(w).Encode(nodes)
 }
 
 func getUsersNodes(user models.User) ([]models.Node, error) {

netclient/functions/join.go

@@ -97,11 +97,10 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string, iscomms bool) error
 		privateKey = wgPrivatekey.String()
 		cfg.Node.PublicKey = wgPrivatekey.PublicKey().String()
 	}
-
 	// Find and set node MacAddress
 	if cfg.Node.MacAddress == "" {
 		macs, err := ncutils.GetMacAddr()
-		if err != nil {
+		if err != nil || iscomms {
 			//if macaddress can't be found set to random string
 			cfg.Node.MacAddress = ncutils.MakeRandomString(18)
 		} else {

scripts/nm-quick.sh

@@ -50,9 +50,7 @@ elif [ -f /etc/fedora-release ]; then
 	dnf update
 fi
 
-dependencies=("docker.io" "docker-compose" "wireguard" "jq" "resolvectl")
-
-
+dependencies=( "docker.io" "docker-compose" "wireguard" "jq" )
 
 for dependency in ${dependencies[@]}; do
     is_installed=$(dpkg-query -W --showformat='${Status}\n' ${dependency} | grep "install ok installed")