Fix initial app deployment

plesk · Jun 16, 2021 · e2b4936 · e2b4936
1 parent dca79e5
commit e2b4936
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -41,13 +41,17 @@ var deployCmd = &cobra.Command{
 		domain, err = config.GetDomain(*server, domainName)
 		if err != nil {
 			fmt.Printf("Creating the domain %s...\n", domainName)
-			err = actions.DomainAdd(*server, domainName, types.ServerIPAddresses{
+			err = actions.DomainAdd(server, domainName, types.ServerIPAddresses{
 				IPv4: []string{defaultIp},
 			})
 			if err != nil {
 				return err
 			}
 			fmt.Println("Domain has been created.")
+			domain, err = config.GetDomain(*server, domainName)
+			if err != nil {
+				return err
+			}
 		} else {
 			fmt.Printf("Domain %s has been found.\n", domainName)
 		}

diff --git a/cmd/domains/create.go b/cmd/domains/create.go
@@ -41,7 +41,7 @@ var createCmd = &cobra.Command{
 		}
 
 		cmd.SilenceUsage = true
-		err = actions.DomainAdd(*server, args[1], ips)
+		err = actions.DomainAdd(server, args[1], ips)
 
 		if err == nil {
 			utils.Log.PrintL("domain.create.success", args[1])

diff --git a/internal/actions/databases.go b/internal/actions/databases.go
@@ -49,7 +49,7 @@ func DatabaseAdd(host types.Server, domain types.Domain, dbs types.DatabaseServe
 		DatabaseServerID: newdb.DatabaseServerID,
 	})
 
-	config.SetDomain(host, domain)
+	config.SetDomain(&host, domain)
 	return nil
 }
 
@@ -95,7 +95,7 @@ func DatabaseDeploy(host types.Server, domain types.Domain, db types.Database, f
 		}
 
 		domain.DatabaseUsers = append(domain.DatabaseUsers, *dbu)
-		config.SetDomain(host, domain)
+		config.SetDomain(&host, domain)
 	}
 
 	var s *string

diff --git a/internal/actions/domains.go b/internal/actions/domains.go
@@ -42,8 +42,8 @@ func validateIps(val types.ServerIPAddresses, comp types.ServerIPAddresses) (boo
 	return v4Valid, v6Valid
 }
 
-func DomainAdd(host types.Server, domain string, ipa types.ServerIPAddresses) error {
-	_, err := config.GetDomain(host, domain)
+func DomainAdd(host *types.Server, domain string, ipa types.ServerIPAddresses) error {
+	_, err := config.GetDomain(*host, domain)
 	if err == nil {
 		return errors.New(locales.L.Get("errors.domain.already.exists", domain))
 	}

diff --git a/internal/actions/ftp.go b/internal/actions/ftp.go
@@ -31,7 +31,7 @@ func FtpUserCreate(host types.Server, domain types.Domain, user *types.FtpUser)
 	}
 
 	domain.FTPUsers = append(domain.FTPUsers, *user)
-	config.SetDomain(host, domain)
+	config.SetDomain(&host, domain)
 
 	return user, nil
 }
diff --git a/internal/config/global.go b/internal/config/global.go
@@ -146,7 +146,7 @@ func DeleteDatabase(host types.Server, dbn string) {
 	}
 
 	if domain != nil {
-		SetDomain(host, *domain)
+		SetDomain(&host, *domain)
 	}
 }
 
@@ -162,7 +162,7 @@ func SetDomains(host *types.Server, newData []types.Domain) {
 	SetServers(append([]types.Server{*host}, servers...))
 }
 
-func SetDomain(host types.Server, domain types.Domain) {
+func SetDomain(host *types.Server, domain types.Domain) {
 	domains, _ := utils.FilterDomains(host.Domains, domain.Name)
-	SetDomains(&host, append(domains, domain))
+	SetDomains(host, append(domains, domain))
 }