mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-09 13:26:52 +08:00
adding StunList
This commit is contained in:
parent
d19f292e6c
commit
4ff135e196
6 changed files with 55 additions and 54 deletions
|
@ -14,6 +14,7 @@ services:
|
||||||
EMQX_REST_ENDPOINT: "http://mq:18083"
|
EMQX_REST_ENDPOINT: "http://mq:18083"
|
||||||
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
||||||
STUN_DOMAIN: "stun.NETMAKER_BASE_DOMAIN"
|
STUN_DOMAIN: "stun.NETMAKER_BASE_DOMAIN"
|
||||||
|
STUN_LIST: "stun.NETMAKER_BASE_DOMAIN:3478,stun1.netmaker.io:3478,stun2.netmaker.io:3478,stun1.l.google.com:19302,stun2.l.google.com:19302"
|
||||||
SERVER_HOST: "SERVER_PUBLIC_IP"
|
SERVER_HOST: "SERVER_PUBLIC_IP"
|
||||||
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
||||||
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
||||||
|
|
|
@ -14,6 +14,7 @@ services:
|
||||||
EMQX_REST_ENDPOINT: "http://mq:18083"
|
EMQX_REST_ENDPOINT: "http://mq:18083"
|
||||||
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
||||||
STUN_DOMAIN: "stun.NETMAKER_BASE_DOMAIN"
|
STUN_DOMAIN: "stun.NETMAKER_BASE_DOMAIN"
|
||||||
|
STUN_LIST: "stun.NETMAKER_BASE_DOMAIN:3478,stun1.netmaker.io:3478,stun2.netmaker.io:3478,stun1.l.google.com:19302,stun2.l.google.com:19302"
|
||||||
SERVER_HOST: "SERVER_PUBLIC_IP"
|
SERVER_HOST: "SERVER_PUBLIC_IP"
|
||||||
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
||||||
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
||||||
|
|
|
@ -11,7 +11,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
BROKER_ENDPOINT: "wss://broker.NETMAKER_BASE_DOMAIN"
|
BROKER_ENDPOINT: "wss://broker.NETMAKER_BASE_DOMAIN"
|
||||||
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
SERVER_NAME: "NETMAKER_BASE_DOMAIN"
|
||||||
STUN_DOMAIN: "stun.NETMAKER_BASE_DOMAIN"
|
STUN_LIST: "stun.NETMAKER_BASE_DOMAIN:3478,stun1.netmaker.io:3478,stun2.netmaker.io:3478,stun1.l.google.com:19302,stun2.l.google.com:19302"
|
||||||
SERVER_HOST: "SERVER_PUBLIC_IP"
|
SERVER_HOST: "SERVER_PUBLIC_IP"
|
||||||
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
SERVER_API_CONN_STRING: "api.NETMAKER_BASE_DOMAIN:443"
|
||||||
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
COREDNS_ADDR: "SERVER_PUBLIC_IP"
|
||||||
|
@ -24,7 +24,6 @@ services:
|
||||||
DATABASE: "sqlite"
|
DATABASE: "sqlite"
|
||||||
NODE_ID: "netmaker-server-1"
|
NODE_ID: "netmaker-server-1"
|
||||||
SERVER_BROKER_ENDPOINT: "ws://mq:1883"
|
SERVER_BROKER_ENDPOINT: "ws://mq:1883"
|
||||||
STUN_PORT: "3478"
|
|
||||||
VERBOSITY: "1"
|
VERBOSITY: "1"
|
||||||
MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
|
MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
|
||||||
MQ_USERNAME: "REPLACE_MQ_USERNAME"
|
MQ_USERNAME: "REPLACE_MQ_USERNAME"
|
||||||
|
|
|
@ -32,48 +32,48 @@ type EnvironmentConfig struct {
|
||||||
|
|
||||||
// ServerConfig - server conf struct
|
// ServerConfig - server conf struct
|
||||||
type ServerConfig struct {
|
type ServerConfig struct {
|
||||||
CoreDNSAddr string `yaml:"corednsaddr"`
|
CoreDNSAddr string `yaml:"corednsaddr"`
|
||||||
APIConnString string `yaml:"apiconn"`
|
APIConnString string `yaml:"apiconn"`
|
||||||
APIHost string `yaml:"apihost"`
|
APIHost string `yaml:"apihost"`
|
||||||
APIPort string `yaml:"apiport"`
|
APIPort string `yaml:"apiport"`
|
||||||
Broker string `yam:"broker"`
|
Broker string `yam:"broker"`
|
||||||
ServerBrokerEndpoint string `yaml:"serverbrokerendpoint"`
|
ServerBrokerEndpoint string `yaml:"serverbrokerendpoint"`
|
||||||
BrokerType string `yaml:"brokertype"`
|
BrokerType string `yaml:"brokertype"`
|
||||||
EmqxRestEndpoint string `yaml:"emqxrestendpoint"`
|
EmqxRestEndpoint string `yaml:"emqxrestendpoint"`
|
||||||
MasterKey string `yaml:"masterkey"`
|
MasterKey string `yaml:"masterkey"`
|
||||||
DNSKey string `yaml:"dnskey"`
|
DNSKey string `yaml:"dnskey"`
|
||||||
AllowedOrigin string `yaml:"allowedorigin"`
|
AllowedOrigin string `yaml:"allowedorigin"`
|
||||||
NodeID string `yaml:"nodeid"`
|
NodeID string `yaml:"nodeid"`
|
||||||
RestBackend string `yaml:"restbackend"`
|
RestBackend string `yaml:"restbackend"`
|
||||||
MessageQueueBackend string `yaml:"messagequeuebackend"`
|
MessageQueueBackend string `yaml:"messagequeuebackend"`
|
||||||
DNSMode string `yaml:"dnsmode"`
|
DNSMode string `yaml:"dnsmode"`
|
||||||
DisableRemoteIPCheck string `yaml:"disableremoteipcheck"`
|
DisableRemoteIPCheck string `yaml:"disableremoteipcheck"`
|
||||||
Version string `yaml:"version"`
|
Version string `yaml:"version"`
|
||||||
SQLConn string `yaml:"sqlconn"`
|
SQLConn string `yaml:"sqlconn"`
|
||||||
Platform string `yaml:"platform"`
|
Platform string `yaml:"platform"`
|
||||||
Database string `yaml:"database"`
|
Database string `yaml:"database"`
|
||||||
Verbosity int32 `yaml:"verbosity"`
|
Verbosity int32 `yaml:"verbosity"`
|
||||||
AuthProvider string `yaml:"authprovider"`
|
AuthProvider string `yaml:"authprovider"`
|
||||||
OIDCIssuer string `yaml:"oidcissuer"`
|
OIDCIssuer string `yaml:"oidcissuer"`
|
||||||
ClientID string `yaml:"clientid"`
|
ClientID string `yaml:"clientid"`
|
||||||
ClientSecret string `yaml:"clientsecret"`
|
ClientSecret string `yaml:"clientsecret"`
|
||||||
FrontendURL string `yaml:"frontendurl"`
|
FrontendURL string `yaml:"frontendurl"`
|
||||||
DisplayKeys string `yaml:"displaykeys"`
|
DisplayKeys string `yaml:"displaykeys"`
|
||||||
AzureTenant string `yaml:"azuretenant"`
|
AzureTenant string `yaml:"azuretenant"`
|
||||||
Telemetry string `yaml:"telemetry"`
|
Telemetry string `yaml:"telemetry"`
|
||||||
HostNetwork string `yaml:"hostnetwork"`
|
HostNetwork string `yaml:"hostnetwork"`
|
||||||
Server string `yaml:"server"`
|
Server string `yaml:"server"`
|
||||||
PublicIPService string `yaml:"publicipservice"`
|
PublicIPService string `yaml:"publicipservice"`
|
||||||
MQPassword string `yaml:"mqpassword"`
|
MQPassword string `yaml:"mqpassword"`
|
||||||
MQUserName string `yaml:"mqusername"`
|
MQUserName string `yaml:"mqusername"`
|
||||||
MetricsExporter string `yaml:"metrics_exporter"`
|
MetricsExporter string `yaml:"metrics_exporter"`
|
||||||
BasicAuth string `yaml:"basic_auth"`
|
BasicAuth string `yaml:"basic_auth"`
|
||||||
LicenseValue string `yaml:"license_value"`
|
LicenseValue string `yaml:"license_value"`
|
||||||
NetmakerAccountID string `yaml:"netmaker_account_id"`
|
NetmakerAccountID string `yaml:"netmaker_account_id"`
|
||||||
IsEE string `yaml:"is_ee"`
|
IsEE string `yaml:"is_ee"`
|
||||||
StunPort int `yaml:"stun_port"`
|
StunPort int `yaml:"stun_port"`
|
||||||
StunHost string `yaml:"stun_host"`
|
StunList string `yaml:"stun_list"`
|
||||||
Proxy string `yaml:"proxy"`
|
Proxy string `yaml:"proxy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SQLConfig - Generic SQL Config
|
// SQLConfig - Generic SQL Config
|
||||||
|
|
|
@ -235,7 +235,7 @@ type ServerConfig struct {
|
||||||
Broker string `yaml:"broker"`
|
Broker string `yaml:"broker"`
|
||||||
Is_EE bool `yaml:"isee"`
|
Is_EE bool `yaml:"isee"`
|
||||||
StunPort int `yaml:"stun_port"`
|
StunPort int `yaml:"stun_port"`
|
||||||
StunHost string `yaml:"stun_host"`
|
StunList string `yaml:"stun_list"`
|
||||||
TrafficKey []byte `yaml:"traffickey"`
|
TrafficKey []byte `yaml:"traffickey"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,8 +43,8 @@ func GetServerConfig() config.ServerConfig {
|
||||||
cfg.AllowedOrigin = GetAllowedOrigin()
|
cfg.AllowedOrigin = GetAllowedOrigin()
|
||||||
cfg.RestBackend = "off"
|
cfg.RestBackend = "off"
|
||||||
cfg.NodeID = GetNodeID()
|
cfg.NodeID = GetNodeID()
|
||||||
cfg.StunHost = GetStunAddr()
|
|
||||||
cfg.StunPort = GetStunPort()
|
cfg.StunPort = GetStunPort()
|
||||||
|
cfg.StunList = GetStunList()
|
||||||
cfg.BrokerType = GetBrokerType()
|
cfg.BrokerType = GetBrokerType()
|
||||||
cfg.EmqxRestEndpoint = GetEmqxRestEndpoint()
|
cfg.EmqxRestEndpoint = GetEmqxRestEndpoint()
|
||||||
if IsRestBackend() {
|
if IsRestBackend() {
|
||||||
|
@ -99,8 +99,8 @@ func GetServerInfo() models.ServerConfig {
|
||||||
}
|
}
|
||||||
cfg.Version = GetVersion()
|
cfg.Version = GetVersion()
|
||||||
cfg.Is_EE = Is_EE
|
cfg.Is_EE = Is_EE
|
||||||
cfg.StunHost = GetStunAddr()
|
|
||||||
cfg.StunPort = GetStunPort()
|
cfg.StunPort = GetStunPort()
|
||||||
|
cfg.StunList = GetStunList()
|
||||||
|
|
||||||
return cfg
|
return cfg
|
||||||
}
|
}
|
||||||
|
@ -178,14 +178,14 @@ func GetAPIPort() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetStunAddr - gets the stun host address
|
// GetStunAddr - gets the stun host address
|
||||||
func GetStunAddr() string {
|
func GetStunList() string {
|
||||||
stunAddr := ""
|
stunList := "stun1.netmaker.io:3478,stun2.netmaker.io:3478"
|
||||||
if os.Getenv("STUN_DOMAIN") != "" {
|
if os.Getenv("STUN_LIST") != "" {
|
||||||
stunAddr = os.Getenv("STUN_DOMAIN")
|
stunList = os.Getenv("STUN_LIST")
|
||||||
} else if config.Config.Server.StunHost != "" {
|
} else if config.Config.Server.StunList != "" {
|
||||||
stunAddr = config.Config.Server.StunHost
|
stunList = config.Config.Server.StunList
|
||||||
}
|
}
|
||||||
return stunAddr
|
return stunList
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCoreDNSAddr - gets the core dns address
|
// GetCoreDNSAddr - gets the core dns address
|
||||||
|
|
Loading…
Add table
Reference in a new issue