working commit

app/config/config.go

@@ -19,18 +19,8 @@ type Service struct {
 	Port    uint32 `json:"port"    yaml:"port"`
 }
 
-type Database struct {
-	Basepath string `json:"basepath" yaml:"basepath"`
-}
-
-type Storage struct {
-	Basepath string `json:"basepath" yaml:"basepath"`
-}
-
 type Config struct {
 	Service   Service  `json:"service"            yaml:"service"`
-	Database  Database `json:"database"           yaml:"database"`
-	Storage   Storage  `json:"storage"            yaml:"storage"`
 	AsDaemon  bool     `json:"asDaemon"           yaml:"asDaemon"`
 	Logpath   string   `json:"logpath"            yaml:"logpath"`
 	Runpath   string   `json:"runpath"            yaml:"runpath"`
@@ -53,23 +43,11 @@ func NewConfig() *Config {
 	runfile := fmt.Sprintf("%s.pid", srvname)
 	runpath := filepath.Join(rundir, runfile)
 
-	//certpath := fmt.Sprintf("%s.crt", srvname)
-	//certpath = filepath.Join(confdir, certpath)
-
-	//keypath := fmt.Sprintf("%s.crt", srvname)
-	//keypath = filepath.Join(confdir, keypath)
-
 	return &Config{
 		Service: Service{
-			Address: "0.0.0.0",
+			Address: "[::]",
 			Port:    1025,
 		},
-		Database: Database{
-			Basepath: datadir,
-		},
-		Storage: Storage{
-			Basepath: datadir,
-		},
 		AsDaemon: false,
 		Logpath:  logpath,
 		Runpath:  runpath,
@@ -124,20 +102,6 @@ func (conf *Config) ReadX509Cert() error {
 		conf.X509Key = string(keyBytes)
 		return err
 	}
-	/*
-		if conf.X509Cert != "" && conf.X509Key != "" {
-			x509Cert, err := base64.StdEncoding.DecodeString(conf.X509Cert)
-			if err != nil {
-				return err
-			}
-			conf.X509Cert = string(x509Cert)
-			x509Key, err := base64.StdEncoding.DecodeString(conf.X509Key)
-			if err != nil {
-				return err
-			}
-			conf.X509Key = string(x509Key)
-		}
-	*/
 	if conf.X509Cert == "" || conf.X509Key == "" {
 		if conf.Hostname == "" {
 			conf.Hostname, err = os.Hostname()
@@ -152,8 +116,6 @@ func (conf *Config) ReadX509Cert() error {
 		conf.X509Cert = string(certBytes)
 		conf.X509Key = string(keyBytes)
 		return err
-
 	}
-
 	return err
 }