zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 09:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

move IS_EE from logic to servercfg

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-09-22 15:01:59 -04:00
parent d54fb0823e
commit ee64e9e282
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ee/initialize.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/servercfg"
) )
// InitEE - Initialize EE Logic // InitEE - Initialize EE Logic
@@ -34,7 +35,7 @@ func setControllerLimits() {
logic.Users_Limit = Limits.Users logic.Users_Limit = Limits.Users
logic.Clients_Limit = Limits.Clients logic.Clients_Limit = Limits.Clients
logic.Free_Tier = Limits.FreeTier logic.Free_Tier = Limits.FreeTier
logic.Is_EE = true servercfg.Is_EE = true
} }
func retrieveEELogo() string { func retrieveEELogo() string {

2
logic/serverconf.go
View File

@@ -17,8 +17,6 @@ var (
Clients_Limit = 1000000000 Clients_Limit = 1000000000
// Free_Tier - specifies if free tier // Free_Tier - specifies if free tier
Free_Tier = false Free_Tier = false
// Is_EE - specifies if enterprise
Is_EE = false
) )
// constant for database key for storing server ids // constant for database key for storing server ids

5
servercfg/serverconf.go
View File

@@ -15,6 +15,7 @@ import (
var ( var (
Version = "dev" Version = "dev"
Is_EE = false
) )
// SetHost - sets the host ip // SetHost - sets the host ip
@@ -84,6 +85,10 @@ func GetServerConfig() config.ServerConfig {
cfg.PortForwardServices = services cfg.PortForwardServices = services
cfg.Server = GetServer() cfg.Server = GetServer()
cfg.Verbosity = GetVerbosity() cfg.Verbosity = GetVerbosity()
cfg.IsEE = "no"
if Is_EE {
cfg.IsEE = "yes"
}
return cfg return cfg
} }