diff --git a/config/config.go b/config/config.go index 6991650f..f9acaf98 100644 --- a/config/config.go +++ b/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 diff --git a/models/structs.go b/models/structs.go index e22473e2..2a723adf 100644 --- a/models/structs.go +++ b/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 diff --git a/scripts/netmaker.default.env b/scripts/netmaker.default.env index b0e3d08c..e66c2e93 100644 --- a/scripts/netmaker.default.env +++ b/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 + diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index 984a5492..b9955b04 100644 --- a/servercfg/serverconf.go +++ b/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")