Major refactoring

commands/executor.go

@@ -0,0 +1,27 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"git.nevets.tech/Keys/CertManager/executor"
+)
+
+var executorServer *executor.Server
+
+func StartExecutorCmd() error {
+	executorServer = &executor.Server{}
+
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-sigCh
+		executorServer.Stop()
+	}()
+	if err := executorServer.Start(); err != nil {
+		return fmt.Errorf("failed to start executor server: %w", err)
+	}
+	return nil
+}

commands/install.go

@@ -13,8 +13,13 @@ import (
 
 func NewDomainCmd(domain, domainDir string, dirOverridden bool) error {
 	//TODO add config option for "overriden dir"
+	err := internal.LoadConfig()
+	if err != nil {
+		return err
+	}
+
 	fmt.Printf("Creating new domain %s\n", domain)
-	err := internal.CreateDomainConfig(domain)
+	err = internal.CreateDomainConfig(domain)
 	if err != nil {
 		return err
 	}
@@ -54,6 +59,11 @@ func InstallCmd(isThin bool, mode string) error {
 		internal.MakeDirs()
 		internal.CreateConfig(mode)
 
+		err := internal.LoadConfig()
+		if err != nil {
+			return err
+		}
+
 		f, err := os.OpenFile("/var/run/certman.pid", os.O_RDONLY|os.O_CREATE, 0755)
 		if err != nil {
 			return fmt.Errorf("error creating pid file: %v", err)
@@ -65,7 +75,15 @@ func InstallCmd(isThin bool, mode string) error {
 
 		newUserCmd := exec.Command("useradd", "-d", "/var/local/certman", "-U", "-r", "-s", "/sbin/nologin", "certman")
 		if output, err := newUserCmd.CombinedOutput(); err != nil {
-			return fmt.Errorf("error creating user: %v: output %s", err, output)
+			if !strings.Contains(err.Error(), "exit status 9") {
+				return fmt.Errorf("error creating user: %v: output %s", err, output)
+			}
+		}
+		newGroupCmd := exec.Command("groupadd", "-r", "-U", "certman", "certsock")
+		if output, err := newGroupCmd.CombinedOutput(); err != nil {
+			if !strings.Contains(err.Error(), "exit status 9") {
+				return fmt.Errorf("error creating group: %v: output %s", err, output)
+			}
 		}
 		certmanUser, err := user.Lookup("certman")
 		if err != nil {