diff --git a/conf/config.go b/conf/config.go deleted file mode 100644 index 894b933..0000000 --- a/conf/config.go +++ /dev/null @@ -1,24 +0,0 @@ -package conf - -import "sync" - -type Config struct { - Name string - Hostname string - PSKPath string - PublicKeyPath string - PrivateKeyPath string - DHTEndpointPort int64 - - BootstrapAddress string -} - -var instance *Config -var once sync.Once - -func GetConfig() *Config { - once.Do(func() { - instance = &Config{} - }) - return instance -} diff --git a/main.go b/main.go index 074949e..1711495 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "oc-peer/conf" "oc-peer/infrastructure" _ "oc-peer/routers" @@ -28,14 +27,6 @@ func main() { o.GetStringDefault("LOKI_URL", ""), o.GetStringDefault("LOG_LEVEL", "info"), ) - conf.GetConfig().Name = o.GetStringDefault("NAME", "local") - conf.GetConfig().Hostname = o.GetStringDefault("HOSTNAME", "http://localhost") - conf.GetConfig().PSKPath = o.GetStringDefault("PSK_PATH", "./psk/psk") - conf.GetConfig().PublicKeyPath = o.GetStringDefault("PEER_PUBLIC_KEY_PATH", "./pem/public.pem") - conf.GetConfig().PrivateKeyPath = o.GetStringDefault("PEER_PRIVATE_KEY_PATH", "./pem/private.pem") - conf.GetConfig().DHTEndpointPort = o.GetInt64Default("DHT_ENDPOINT_PORT", 4001) - - conf.GetConfig().BootstrapAddress = o.GetStringDefault("BOOTSTRAP_ADDRESS", "") // Beego init beego.BConfig.AppName = appname beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)