Merge branch 'master' of git.unix7.org:ziggi/mstore

app/config/config.go

@@ -39,11 +39,11 @@ type Config struct {
 	Keypath   string   `json:"keypath,omitempty"  yaml:"keypath,omitempty"`
 	X509Cert  string   `json:"-"                  yaml:"-"`
 	X509Key   string   `json:"-"                  yaml:"-"`
-	Datadir   string   `json:"datadir"            yaml:datadir`
-	Hostname  string   `json:"hostname"           yaml:hostname`
-	Hostnames []string `json:"hostnames"          yaml:hostnames`
-	LogLimit  int64    `json:"logLimit"           yaml:logLimit`
-	RunUser   string   `json:"runUser"    yaml:runUser`
+	Datadir   string   `json:"datadir"            yaml:"datadir"`
+	Hostname  string   `json:"hostname"           yaml:"hostname"`
+	Hostnames []string `json:"hostnames"          yaml:"hostnames"`
+	LogLimit  int64    `json:"logLimit"           yaml:"logLimit"`
+	RunUser   string   `json:"runUser"            yaml:"runUser"`
 }
 
 func NewConfig() *Config {

cmd/mstorectl/accountcmd/updacc.go

@@ -12,7 +12,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"mstore/pkg/accntcli"
-	"mstore/pkg/descr"
 )
 
 // UpdateAccount
@@ -23,7 +22,6 @@ type UpdateAccountParams struct {
 	NewPassword string
 }
 type UpdateAccountResult struct {
-	File *descr.File `json:"file,omitempty"`
 }
 
 func (util *AccountUtil) UpdateAccount(cmd *cobra.Command, args []string) {