Merge branch 'main' into weblate-main

Author: mackdk

mgradm/shared/templates/attestationServiceTemplate.go

@@ -14,8 +14,9 @@ const attestationServiceTemplate = `
 # Use an uyuni-server-attestation.service.d/local.conf file to override
 [Unit]
 Description=Uyuni server attestation container service
-Wants=network.target
-After=network-online.target
+Wants=network.target uyuni-db.service
+After=network-online.target uyuni-db.service
+
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
@@ -41,6 +42,7 @@ PIDFile=%t/uyuni-server-attestation-%i.pid
 TimeoutStopSec=60
 TimeoutStartSec=60
 Type=forking
+
 [Install]
 WantedBy=multi-user.target default.target
 `

mgradm/shared/templates/hubXmlrpcServiceTemplate.go

@@ -16,8 +16,8 @@ const hubXmlrpcServiceTemplate = `# uyuni-uyuni-hub-xmlrpc.service, generated by
 
 [Unit]
 Description=Uyuni Hub XMLRPC API container service
-Wants=network.target
-After=network-online.target
+Wants=network.target uyuni-server.service
+After=network-online.target uyuni-server.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

mgradm/shared/templates/pgsqlServiceTemplate.go

@@ -19,6 +19,7 @@ Description=Uyuni database container service
 Wants=network.target
 After=network-online.target
 RequiresMountsFor=%t/containers
+RequiresMountsFor=%S/containers/storage/volumes/var-pgsql %S/containers/storage/volumes/var-pgsql-walbackup
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

mgradm/shared/templates/serviceTemplate.go

@@ -16,9 +16,9 @@ const serviceTemplate = `# uyuni-server.service, generated by mgradm
 
 [Unit]
 Description=Uyuni server image container service
-Wants=network.target
-After=network-online.target
-RequiresMountsFor=%t/containers
+Wants=network.target uyuni-db.service
+After=network-online.target uyuni-db.service
+RequiresMountsFor=%t/containers %S/containers/storage/volumes
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

mgradm/shared/templates/templates_test.go

@@ -100,9 +100,9 @@ func TestTemplatesRender(t *testing.T) {
 
 [Unit]
 Description=Uyuni server image container service
-Wants=network.target
-After=network-online.target
-RequiresMountsFor=%t/containers
+Wants=network.target uyuni-db.service
+After=network-online.target uyuni-db.service
+RequiresMountsFor=%t/containers %S/containers/storage/volumes
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
@@ -188,9 +188,9 @@ WantedBy=multi-user.target default.target
 
 [Unit]
 Description=Uyuni server image container service
-Wants=network.target
-After=network-online.target
-RequiresMountsFor=%t/containers
+Wants=network.target uyuni-db.service
+After=network-online.target uyuni-db.service
+RequiresMountsFor=%t/containers %S/containers/storage/volumes
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

mgradm/shared/templates/tftpdServiceTemplate.go

@@ -14,9 +14,8 @@ const tftpdTemplate = `# uyuni-tftpd.service, generated by mgradm
 
 [Unit]
 Description=Uyuni tftpd container service
-Wants=network.target
-After=network-online.target
-After=uyuni-server.service
+Wants=network.target uyuni-server.service
+After=network-online.target uyuni-server.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

uyuni-tools.changes.oholecek.add_weak_dependencies

@@ -0,0 +1,2 @@
+- Make uyuni-server service dependent on uyuni-db
+  (bsc#1263823)

uyuni-tools.spec

@@ -82,8 +82,14 @@ BuildRequires:  golang(API) >= 1.25
 # suse_version
 
 %if 0%{?ubuntu}
+%if 0%{?ubuntu} >= 2404
+# Will use the default golang of the OS which is higher than minimal required go_version
+BuildRequires:  golang
+%else
+# Overwrite with new go version the OS default
 %define go_version      1.22
-BuildRequires:  golang >= %{go_version}
+BuildRequires:  golang-%{go_version}
+%endif
 %endif
 # ubuntu