diff --git a/ee/initialize.go b/ee/initialize.go index 9439d6ac..a83ad354 100644 --- a/ee/initialize.go +++ b/ee/initialize.go @@ -9,6 +9,7 @@ import ( "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/models" + "github.com/gravitl/netmaker/servercfg" ) // InitEE - Initialize EE Logic @@ -34,7 +35,7 @@ func setControllerLimits() { logic.Users_Limit = Limits.Users logic.Clients_Limit = Limits.Clients logic.Free_Tier = Limits.FreeTier - logic.Is_EE = true + servercfg.Is_EE = true } func retrieveEELogo() string { diff --git a/logic/serverconf.go b/logic/serverconf.go index fbd5faf5..284e2d45 100644 --- a/logic/serverconf.go +++ b/logic/serverconf.go @@ -17,8 +17,6 @@ var ( Clients_Limit = 1000000000 // Free_Tier - specifies if free tier Free_Tier = false - // Is_EE - specifies if enterprise - Is_EE = false ) // constant for database key for storing server ids diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index 2ad86a97..600b474a 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -15,6 +15,7 @@ import ( var ( Version = "dev" + Is_EE = false ) // SetHost - sets the host ip @@ -84,6 +85,10 @@ func GetServerConfig() config.ServerConfig { cfg.PortForwardServices = services cfg.Server = GetServer() cfg.Verbosity = GetVerbosity() + cfg.IsEE = "no" + if Is_EE { + cfg.IsEE = "yes" + } return cfg }