working commit

cmd/mbaseadmin/main.go

@@ -15,8 +15,8 @@ import (
 	"time"
 
 	"mbase/app/config"
-	"mbase/app/database"
-	"mbase/app/descriptor"
+	"mbase/app/maindb"
+	"mbase/app/descr"
 	"mbase/app/logic"
 
 	"sigs.k8s.io/yaml"
@@ -61,8 +61,8 @@ type Util struct {
 
 	conf  *config.Config
 	lg    *logic.Logic
-	db    *database.Database
-	state descriptor.Server
+	db    *maindb.Database
+	state descr.Server
 	sfile string
 
 	accessUsername string
@@ -287,7 +287,7 @@ func (util *Util) Build() error {
 
 	util.sfile = filepath.Join(util.conf.DataDir, "certmanager.yaml")
 
-	db, err := database.NewDatabase(util.conf.DataDir)
+	db, err := maindb.NewDatabase(util.conf.DataDir)
 	if err != nil {
 		return err
 	}