Prechádzať zdrojové kódy

Revert "option of turn off stun"

This reverts commit 64b6a11e52cc642bec0d176a02f6fccefed81f89.
abhishek9686 10 mesiacov pred
rodič
commit
14d2d3cefb

+ 0 - 1
config/config.go

@@ -102,7 +102,6 @@ type ServerConfig struct {
 	MetricInterval             string        `yaml:"metric_interval"`
 	ManageDNS                  bool          `yaml:"manage_dns"`
 	DefaultDomain              string        `yaml:"default_domain"`
-	StunStatus                 bool          `yaml:"stun_status"`
 }
 
 // SQLConfig - Generic SQL Config

+ 0 - 1
models/structs.go

@@ -268,7 +268,6 @@ type ServerConfig struct {
 	MetricInterval string `yaml:"metric_interval"`
 	ManageDNS      bool   `yaml:"manage_dns"`
 	DefaultDomain  string `yaml:"default_domain"`
-	StunStatus     bool   `yaml:"stun_status"`
 }
 
 // User.NameInCharset - returns if name is in charset below or not

+ 1 - 2
scripts/netmaker.default.env

@@ -92,5 +92,4 @@ PEER_UPDATE_BATCH=true
 PEER_UPDATE_BATCH_SIZE=50
 # default domain for internal DNS lookup
 DEFAULT_DOMAIN=netmaker.hosted
-# config to turn off Stun
-STUN_STATUS=true
+

+ 0 - 10
servercfg/serverconf.go

@@ -95,7 +95,6 @@ func GetServerConfig() config.ServerConfig {
 	cfg.MetricInterval = GetMetricInterval()
 	cfg.ManageDNS = GetManageDNS()
 	cfg.DefaultDomain = GetDefaultDomain()
-	cfg.StunStatus = GetSTUNStatus()
 	return cfg
 }
 
@@ -142,7 +141,6 @@ func GetServerInfo() models.ServerConfig {
 	cfg.MetricInterval = GetMetricInterval()
 	cfg.ManageDNS = GetManageDNS()
 	cfg.DefaultDomain = GetDefaultDomain()
-	cfg.StunStatus = GetSTUNStatus()
 	return cfg
 }
 
@@ -848,14 +846,6 @@ func GetAllowedEmailDomains() string {
 	return allowedDomains
 }
 
-func GetSTUNStatus() bool {
-	s := true
-	if os.Getenv("STUN_STATUS") != "" {
-		s = os.Getenv("STUN_STATUS") == "true"
-	}
-	return s
-}
-
 // GetNmBaseDomain - fetches nm base domain
 func GetNmBaseDomain() string {
 	return os.Getenv("NM_DOMAIN")