Merge pull request #3282 from gravitl/master

Master

compose/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - sqldata:/root/data
     environment:
       # config-dependant vars
-      - STUN_SERVERS=stun1.netmaker.io:3478,stun2.netmaker.io:3478,stun1.l.google.com:19302,stun2.l.google.com:19302
+      - STUN_SERVERS=stun1.l.google.com:19302,stun2.l.google.com:19302,stun3.l.google.com:19302,stun4.l.google.com:19302
       # The domain/host IP indicating the mq broker address
       - BROKER_ENDPOINT=wss://broker.${NM_DOMAIN} # For EMQX broker use `BROKER_ENDPOINT=wss://broker.${NM_DOMAIN}/mqtt`
       # For EMQX broker (uncomment the two lines below)
@@ -52,11 +52,11 @@ services:
       - caddy_data:/data
       - caddy_conf:/config
     ports:
-      - "$SERVER_HOST:80:80"
-      - "$SERVER_HOST:443:443"
+      - "$SERVER_HOST:80:80/tcp"
+      - "$SERVER_HOST:443:443/tcp"
     #uncomment to enable IPv6 communication
-     # - "$SERVER_HOST6:80:80"
-     # - "$SERVER_HOST6:443:443"
+     # - "$SERVER_HOST6:80:80/tcp"
+     # - "$SERVER_HOST6:443:443/tcp"
 
   coredns:
     #network_mode: host

pro/logic/user_mgmt.go

@@ -1213,6 +1213,7 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
 			Default:     true,
 			ServiceType: models.Any,
 			NetworkID:   netID,
+			Proto:       models.ALL,
 			RuleType:    models.UserPolicy,
 			Src: []models.AclPolicyTag{
 				{
@@ -1245,6 +1246,7 @@ func CreateDefaultUserPolicies(netID models.NetworkID) {
 			Default:     true,
 			ServiceType: models.Any,
 			NetworkID:   netID,
+			Proto:       models.ALL,
 			RuleType:    models.UserPolicy,
 			Src: []models.AclPolicyTag{
 				{

scripts/nm-quick.sh

@@ -127,7 +127,7 @@ setup_netclient() {
 	./netclient install
 	echo "Register token: $TOKEN"
 	sleep 2
-	netclient join -t $TOKEN --static-port -p 443
+	netclient join -t $TOKEN
 
 	echo "waiting for netclient to become available"
 	local found=false
@@ -137,7 +137,7 @@ setup_netclient() {
 			found=true
 			break
 		fi
-		sleep 1
+		sleep 3
 	done
 
 	if [ "$found" = false ]; then
@@ -509,8 +509,8 @@ set -e
 # set_install_vars - sets the variables that will be used throughout installation
 set_install_vars() {
 
-	IP_ADDR=$(curl -s -4 ifconfig.me)
-	IP6_ADDR=$(curl -s -6 ifconfig.me)
+	IP_ADDR=$(curl -s -4 ifconfig.me || echo "")
+    IP6_ADDR=$(curl -s -6 ifconfig.me || echo "")
 	if [ "$NETMAKER_BASE_DOMAIN" = "" ]; then
 		NETMAKER_BASE_DOMAIN=nm.$(echo $IP_ADDR | tr . -).nip.io
 	fi