Merge pull request #2596 from gravitl/release-v0.21.0

Release v0.21.0 fixes

pro/license.go

@@ -9,11 +9,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"golang.org/x/exp/slog"
 	"io"
 	"net/http"
 	"time"
 
+	"golang.org/x/exp/slog"
+
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
@@ -51,8 +52,8 @@ func ValidateLicense() (err error) {
 	defer func() {
 		if err != nil {
 			err = fmt.Errorf("%w: %s", errValidation, err.Error())
-			servercfg.ErrLicenseValidation = err
 		}
+		servercfg.ErrLicenseValidation = err
 	}()
 
 	licenseKeyValue := servercfg.GetLicenseKey()

scripts/netmaker.default.env

@@ -19,47 +19,48 @@ NETMAKER_TENANT_ID=
 LICENSE_KEY=
 SERVER_IMAGE_TAG=
 UI_IMAGE_TAG=
-NETCLIENT_ENDPOINT_DETECTION="disabled"
+NETCLIENT_ENDPOINT_DETECTION=disabled
 # used for HA - identifies this server vs other servers
-NODE_ID="netmaker-server-1"
-METRICS_EXPORTER="off"
-PROMETHEUS="off"
+NODE_ID=netmaker-server-1
+METRICS_EXPORTER=off
+PROMETHEUS=off
 # Enables DNS Mode, meaning all nodes will set hosts file for private dns settings
-DNS_MODE="on"
+DNS_MODE=on
 # Enable auto update of netclient ? ENUM:- enabled,disabled | default=enabled
-NETCLIENT_AUTO_UPDATE="enabled"
+NETCLIENT_AUTO_UPDATE=enabled
 # The HTTP API port for Netmaker. Used for API calls / communication from front end.
 # If changed, need to change port of BACKEND_URL for netmaker-ui.
-API_PORT="8081"
-EXPORTER_API_PORT="8085"
+API_PORT=8081
+EXPORTER_API_PORT=8085
 # The "allowed origin" for API requests. Change to restrict where API requests can come from with comma-separated
 # URLs. ex:- https://dashboard.netmaker.domain1.com,https://dashboard.netmaker.domain2.com
-CORS_ALLOWED_ORIGIN="*"
+CORS_ALLOWED_ORIGIN=*
 # Show keys permanently in UI (until deleted) as opposed to 1-time display.
-DISPLAY_KEYS="on"
+DISPLAY_KEYS=on
 # Database to use - sqlite, postgres, or rqlite
-DATABASE="sqlite"
+DATABASE=sqlite
 # The address of the mq server. If running from docker compose it will be "mq". Otherwise, need to input address.
 # If using "host networking", it will find and detect the IP of the mq container.
-SERVER_BROKER_ENDPOINT="ws://mq:1883" # For EMQX websockets use `SERVER_BROKER_ENDPOINT=ws://mq:8083/mqtt`
+# For EMQX websockets use `SERVER_BROKER_ENDPOINT=ws://mq:8083/mqtt`
+SERVER_BROKER_ENDPOINT=ws://mq:1883 
 # The reachable port of STUN on the server
-STUN_PORT="3478"
+STUN_PORT=3478
 # Logging verbosity level - 1, 2, or 3
-VERBOSITY="1"
+VERBOSITY=1
 # Port to access turn server
-TURN_PORT="3479"
+TURN_PORT=3479
 # Config for using turn, accepts either true/false
-USE_TURN="true"
-DEBUG_MODE="off"
-TURN_API_PORT="8089"
+USE_TURN=true
+DEBUG_MODE=off
+TURN_API_PORT=8089
 # Enables the REST backend (API running on API_PORT at SERVER_HTTP_HOST).
 # Change to "off" to turn off.
-REST_BACKEND="on"
+REST_BACKEND=on
 # If turned "on", Server will not set Host based on remote IP check.
 # This is already overridden if SERVER_HOST is set. Turned "off" by default.
-DISABLE_REMOTE_IP_CHECK="off"
+DISABLE_REMOTE_IP_CHECK=off
 # Whether or not to send telemetry data to help improve Netmaker. Switch to "off" to opt out of sending telemetry.
-TELEMETRY="on"
+TELEMETRY=on
 ###
 #
 # OAuth section