Merge branch 'main' into weblate-main

Author: mcalmer

.tito/packages/uyuni-tools

@@ -1 +1 @@
-5.1.11-0 ./
+5.1.12-0 ./

mgradm/cmd/backup/restore/podman_utils.go

@@ -11,7 +11,6 @@ import (
 	"errors"
 	"io"
 	"os"
-	"path"
 
 	"github.com/rs/zerolog/log"
 	"github.com/uyuni-project/uyuni-tools/mgradm/cmd/backup/shared"
@@ -206,39 +205,3 @@ func restorePodmanSecrets(header *tar.Header, tr *tar.Reader, flags *shared.Flag
 	}
 	return hasError
 }
-
-// handleVolumeHacks handles special import cicrumstances.
-// etc-apache2 volume has a trailing mime.type link which podman import reports as an error.
-// etc-postfix volume has a trailing cacerts link which podman import reports as an error.
-func handleVolumeHacks(volume string, inErr error) error {
-	// Quick return if everything is ok
-	// or if something happened and volume was not imported at all
-	if inErr == nil || !podman.IsVolumePresent(volume) {
-		return inErr
-	}
-	// special handling of apache2 and postfix volume with trailing links
-	basePath, err := podman.GetPodmanVolumeBasePath()
-	if err != nil {
-		log.Debug().Msg("cannot get base volume path")
-		return inErr
-	}
-	switch volume {
-	case "etc-apache2":
-		log.Debug().Msg("Special apache2 volume handling")
-		volumePath := path.Join(basePath, "etc-apache2", "_data")
-		if err := os.Symlink("../mime.types", path.Join(volumePath, "mime.types")); err != nil {
-			log.Debug().Err(err).Msgf("cannot create link %s for %s", path.Join(volumePath, "mime.types"), "../mime.types")
-			return inErr
-		}
-		return nil
-	case "etc-postfix":
-		log.Debug().Msg("Special postfix volume handling")
-		volumePath := path.Join(basePath, "etc-postfix", "_data")
-		if err := os.Symlink("../../ssl/certs", path.Join(volumePath, "ssl", "cacerts")); err != nil {
-			log.Debug().Err(err).Msgf("cannot create link %s for %s", path.Join(volumePath, "ssl", "cacerts"), "../../ssl/certs")
-			return inErr
-		}
-		return nil
-	}
-	return inErr
-}

mgradm/cmd/backup/restore/restore.go

@@ -208,15 +208,14 @@ func gatherImagesToRestore(source string, flags *shared.Flagpole) ([]string, err
 }
 
 func restoreVolumes(volumes []string, flags *shared.Flagpole, dryRun bool) error {
-	var hasError error
 	for _, volume := range volumes {
 		volName := strings.TrimSuffix(volume, ".tar")
 		_, volName = path.Split(volName)
 		if err := podman.ImportVolume(volName, volume, flags.SkipVerify, dryRun); err != nil {
-			hasError = utils.JoinErrors(hasError, handleVolumeHacks(volName, err))
+			return err
 		}
 	}
-	return hasError
+	return nil
 }
 
 func restoreImages(images []string, dryRun bool) error {

mgradm/cmd/cmd.go

@@ -7,6 +7,7 @@ package cmd
 import (
 	"os"
 	"path"
+	"strings"
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -64,9 +65,8 @@ func NewUyuniadmCommand() (*cobra.Command, error) {
 		if cmd.Name() != "completion" {
 			utils.LogInit(true)
 			utils.SetLogLevel(globalFlags.LogLevel)
-			log.Info().Msgf(L("Welcome to %s"), name)
+			log.Info().Msgf(L("Starting %s"), strings.Join(os.Args, " "))
 			log.Info().Msgf(L("Use of this software implies acceptance of the End User License Agreement."))
-			log.Info().Msgf(L("Executing command: %s"), cmd.Name())
 		}
 	}
 

mgradm/cmd/install/podman/utils.go

@@ -117,25 +117,6 @@ func installForPodman(
 		return err
 	}
 
-	if err := coco.SetupCocoContainer(
-		systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
-		flags.Installation.DB,
-	); err != nil {
-		return err
-	}
-
-	if err := hub.SetupHubXmlrpc(
-		systemd, authFile, flags.Image.Registry, flags.Image.PullPolicy, flags.Image.Tag, flags.HubXmlrpc,
-	); err != nil {
-		return err
-	}
-
-	if err := saline.SetupSalineContainer(
-		systemd, authFile, flags.Image.Registry, flags.Saline, flags.Image, flags.Installation.TZ,
-	); err != nil {
-		return err
-	}
-
 	cnx := shared.NewConnection("podman", shared_podman.ServerContainerName, "")
 	if err := podman.WaitForSystemStart(systemd, cnx, preparedImage, flags.Installation.TZ,
 		flags.Installation.Debug.Java, flags.Mirror, flags.Podman.Args); err != nil {
@@ -155,6 +136,25 @@ func installForPodman(
 	if err := shared_podman.EnablePodmanSocket(); err != nil {
 		return utils.Error(err, L("cannot enable podman socket"))
 	}
+
+	if err := coco.SetupCocoContainer(
+		systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
+		flags.Installation.DB,
+	); err != nil {
+		return err
+	}
+
+	if err := hub.SetupHubXmlrpc(
+		systemd, authFile, flags.Image.Registry, flags.Image.PullPolicy, flags.Image.Tag, flags.HubXmlrpc,
+	); err != nil {
+		return err
+	}
+
+	if err := saline.SetupSalineContainer(
+		systemd, authFile, flags.Image.Registry, flags.Saline, flags.Image, flags.Installation.TZ,
+	); err != nil {
+		return err
+	}
 	return nil
 }
 

mgradm/cmd/install/shared/flags.go

@@ -52,4 +52,7 @@ func AddInstallFlags(cmd *cobra.Command) {
 	_ = utils.AddFlagToHelpGroupID(cmd, "admin-firstName", "first-user")
 	_ = utils.AddFlagToHelpGroupID(cmd, "admin-lastName", "first-user")
 	_ = utils.AddFlagToHelpGroupID(cmd, "organization", "first-user")
+
+	cmd.Flags().String("ssl-password", "", L("Password for the CA key to generate"))
+	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-password", "ssl")
 }

mgradm/cmd/migrate/shared/flags.go

@@ -8,11 +8,12 @@ import (
 	"github.com/spf13/cobra"
 	adm_utils "github.com/uyuni-project/uyuni-tools/mgradm/shared/utils"
 	. "github.com/uyuni-project/uyuni-tools/shared/l10n"
+	"github.com/uyuni-project/uyuni-tools/shared/utils"
 )
 
 // AddMigrateFlags add migration flags to a command.
 func AddMigrateFlags(cmd *cobra.Command) {
-	cmd.Flags().Bool("prepare", false, L("Prepare the mgration - copy the data without stopping the source server."))
+	cmd.Flags().Bool("prepare", false, L("Prepare the migration - copy the data without stopping the source server."))
 
 	cmd.Flags().String("user", "root",
 		L("User on the source server. Non-root user must have passwordless sudo privileges (NOPASSWD tag in /etc/sudoers)."),
@@ -23,4 +24,7 @@ func AddMigrateFlags(cmd *cobra.Command) {
 	adm_utils.AddUpgradeCocoFlag(cmd)
 	adm_utils.AddUpgradeHubXmlrpcFlags(cmd)
 	adm_utils.AddUpgradeSalineFlag(cmd)
+
+	cmd.Flags().String("ssl-password", "", L("Current Server CA password"))
+	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-password", "ssl")
 }

mgradm/cmd/upgrade/shared/flags.go

@@ -7,6 +7,8 @@ package shared
 import (
 	"github.com/spf13/cobra"
 	adm_utils "github.com/uyuni-project/uyuni-tools/mgradm/shared/utils"
+	. "github.com/uyuni-project/uyuni-tools/shared/l10n"
+	"github.com/uyuni-project/uyuni-tools/shared/utils"
 )
 
 // AddUpgradeFlags add upgrade flags to a command.
@@ -17,6 +19,9 @@ func AddUpgradeFlags(cmd *cobra.Command) {
 	adm_utils.AddUpgradeCocoFlag(cmd)
 	adm_utils.AddUpgradeHubXmlrpcFlags(cmd)
 	adm_utils.AddUpgradeSalineFlag(cmd)
+
+	cmd.Flags().String("ssl-password", "", L("Current Server CA password"))
+	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-password", "ssl")
 }
 
 // AddUpgradeListFlags add upgrade list flags to a command.

mgradm/shared/podman/podman.go

@@ -371,7 +371,7 @@ func Upgrade(
 			oldPgVersion, newPgVersion,
 		)
 		if err := RunPgsqlVersionUpgrade(
-			authFile, registry, pgsqlFlags.Image, upgradeImage, strconv.Itoa(oldPgVersion),
+			authFile, registry, image, upgradeImage, strconv.Itoa(oldPgVersion),
 			strconv.Itoa(newPgVersion),
 		); err != nil {
 			return utils.Errorf(err, L("cannot run PostgreSQL version upgrade script"))
@@ -416,7 +416,16 @@ func Upgrade(
 	if err := updateServerSystemdService(); err != nil {
 		return err
 	}
+
 	log.Info().Msg(L("Waiting for the server to start…"))
+	cnx := shared.NewConnection("podman", podman.ServerContainerName, "")
+	if err := systemd.StartService(podman.ServerService); err != nil {
+		return utils.Error(err, L("cannot start service"))
+	}
+
+	if err := cnx.WaitForHealthcheck(); err != nil {
+		log.Warn().Err(err)
+	}
 
 	inspectedDB := adm_utils.DBFlags{
 		Name:     inspectedValues.DBName,
@@ -466,7 +475,7 @@ func WaitForSystemStart(
 		return utils.Error(err, L("cannot enable service"))
 	}
 
-	return cnx.WaitForServer()
+	return cnx.WaitForHealthcheck()
 }
 
 // Migrate will migrate a server to the image given as attribute.

mgradm/shared/podman/ssl.go

@@ -211,7 +211,7 @@ func reuseExistingCertificatesFromMounts(image string, tempDir string, isDatabas
 	rootCA, err := shared_podman.ReadFromContainer(containerName, image, volumes, nil,
 		caCheckPath)
 	if err != nil {
-		log.Debug().Err(err).Msgf("CA file %s not found", caCheckPath)
+		log.Info().Msgf(L("CA file %s not found. New CA and certificates will be created."), caCheckPath)
 		return false, nil
 	}
 
@@ -223,7 +223,7 @@ func reuseExistingCertificatesFromMounts(image string, tempDir string, isDatabas
 	cert, err := shared_podman.ReadFromContainer(containerName, image, volumes, nil,
 		crtCheckPath)
 	if err != nil {
-		log.Debug().Err(err).Msgf("Cert file %s not found", crtCheckPath)
+		log.Info().Msgf(L("Cert file %s not found. A new certificate will be created."), crtCheckPath)
 		return false, nil
 	}
 	if err = os.WriteFile(serverCert, cert, 0444); err != nil {
@@ -234,7 +234,7 @@ func reuseExistingCertificatesFromMounts(image string, tempDir string, isDatabas
 	keyData, err := shared_podman.ReadFromContainer(containerName, image, volumes, nil,
 		keyCheckPath)
 	if err != nil {
-		log.Debug().Err(err).Msgf("Cert Key file %s not found", keyCheckPath)
+		log.Info().Msgf(L("Cert key file %s not found. A new certificate will be created."), keyCheckPath)
 		return false, nil
 	}
 	if err = os.WriteFile(serverKey, keyData, 0400); err != nil {
@@ -302,7 +302,7 @@ func generateServerCertificate(image string, sslFlags *adm_utils.InstallSSLFlags
 		"HOSTNAME":     fqdn,
 	}
 	if err := runSSLContainer(sslSetupServerScript, tempDir, image, tz, env); err != nil {
-		return utils.Error(err, L("Server SSL certificates generation failed"))
+		return utils.Error(err, L("Failed to generate server SSL certificates. Please check the input parameters."))
 	}
 
 	log.Info().Msg(L("Server SSL certificates generated"))
@@ -339,7 +339,7 @@ func generateDatabaseCertificate(image string, sslFlags *adm_utils.InstallSSLFla
 		"HOSTNAME":     fqdn,
 	}
 	if err := runSSLContainer(sslSetupDatabaseScript, tempDir, image, tz, env); err != nil {
-		return utils.Error(err, L("Database SSL certificates generation failed"))
+		return utils.Error(err, L("Failed to generate server Database SSL certificates. Please check the input parameters."))
 	}
 
 	log.Info().Msg(L("Database SSL certificates generated"))