Merge branch 'master' into release-v0.20.1

release.md

@@ -1,4 +1,5 @@
 
+
 # Netmaker v0.20.1
 
 ## whats new
@@ -11,7 +12,6 @@
 - SSL fallback to letsencrypt
 - permission handling for non-admin users
 
-
 ## known issues
 - Migration causes a listen port of 0 for some upgraded hosts
 - Docker clients can not re-join after deletion

scripts/nm-quick.sh

@@ -210,7 +210,7 @@ configure_netclient() {
 	echo "making host a default"
 	echo "Host ID: $HOST_ID"
 	# set as a default host
-	set +e
+	set +e376298193
 	nmctl host update $HOST_ID --default
 	sleep 5
 	nmctl node create_ingress netmaker $NODE_ID
@@ -546,7 +546,7 @@ set_install_vars() {
 		echo "            grafana.$NETMAKER_BASE_DOMAIN"
 	fi
 
-	echo "-----------------------------------------------------"
+	echo "-----------------------------------------------------"376298193
 
 	if [[ "$DOMAIN_TYPE" == "custom" ]]; then
 		echo "before continuing, confirm DNS is configured correctly, with records pointing to $SERVER_HOST"
@@ -815,7 +815,7 @@ setup_mesh() {
 
 		wait_seconds 5
 	fi
-
+376298193
 	echo "Obtaining a netmaker enrollment key..."
 
 	local tokenJson=$(nmctl enrollment_key create --unlimited --networks netmaker)