working commit

app/config/config.go

@@ -26,17 +26,17 @@ type Storage struct {
 }
 
 type Config struct {
-	Service  Service  `json:"service"  yaml:"service"`
+	Service  Service  `json:"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"`
 	Version  string   `json:"version"  yaml:"version"`
-	Certpath string   `json:"certpath" yaml:"certath"`
-	Keypath  string   `json:"keypath"  yaml:"keypath"`
-	X509Cert string   `json:"X509cert" yaml:"X509cert"`
-	X509Key  string   `json:"X509key"  yaml:"X509key"`
+	Certpath string   `json:"certpath,omitempty" yaml:"certath"`
+	Keypath  string   `json:"keypath,omitempty"  yaml:"keypath"`
+	X509Cert string   `json:"-" yaml:"-"`
+	X509Key  string   `json:"-"  yaml:"-"`
 }
 
 func NewConfig() *Config {
@@ -46,11 +46,11 @@ func NewConfig() *Config {
 	runfile := fmt.Sprintf("%s.run", srvname)
 	runpath := filepath.Join(rundir, runfile)
 
-	certpath := fmt.Sprintf("%s.crt", srvname)
-	certpath = filepath.Join(confdir, certpath)
+	//certpath := fmt.Sprintf("%s.crt", srvname)
+	//certpath = filepath.Join(confdir, certpath)
 
-	keypath := fmt.Sprintf("%s.crt", srvname)
-	keypath = filepath.Join(confdir, keypath)
+	//keypath := fmt.Sprintf("%s.crt", srvname)
+	//keypath = filepath.Join(confdir, keypath)
 
 	return &Config{
 		Service: Service{
@@ -67,8 +67,9 @@ func NewConfig() *Config {
 		Logpath:  logpath,
 		Runpath:  runpath,
 		Version:  version,
-		Certpath: certpath,
-		Keypath:  keypath,
+
+		//Certpath: certpath,
+		//Keypath:  keypath,
 	}
 }