read env var from http conf file (bsc#1253282)

Author: mbussolotto

mgrpxy/shared/templates/httpd.go

@@ -23,9 +23,6 @@ After=uyuni-proxy-pod.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-httpd.pid %t/uyuni-proxy-httpd.ctr-id
 
@@ -42,6 +39,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	{{- if .SystemIDSecret }}
 	--secret {{ .SystemIDSecret }},type=mount,mode=0444,target="/etc/sysconfig/rhn/systemid" \
 	{{- end }}
+	{{- if .HTTPProxyFile }}
+	-v {{ .HTTPProxyFile }}:{{ .HTTPProxyFile }}:ro \
+	{{- end }}
 	${HTTPD_EXTRA_CONF} --name uyuni-proxy-httpd \
 	${UYUNI_IMAGE}'
 

mgrpxy/shared/templates/pod.go

@@ -30,9 +30,6 @@ Before=uyuni-proxy-tftpd.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-pod.pid %t/uyuni-proxy-pod.pod-id
 

mgrpxy/shared/templates/salt-broker.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,9 +21,6 @@ After=uyuni-proxy-pod.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-salt-broker.pid %t/uyuni-proxy-salt-broker.ctr-id
 
@@ -34,6 +31,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--pod-id-file %t/uyuni-proxy-pod.pod-id -d \
 	--replace -dt \
 	-v /etc/uyuni/proxy:/etc/uyuni:ro \
+	{{- if .HTTPProxyFile }}
+	-v {{ .HTTPProxyFile }}:{{ .HTTPProxyFile }}:ro \
+	{{- end }}
 	--name uyuni-proxy-salt-broker \
 	${UYUNI_IMAGE}'
 

mgrpxy/shared/templates/squid.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -23,9 +23,6 @@ After=uyuni-proxy-pod.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-squid.pid %t/uyuni-proxy-squid.ctr-id
 
@@ -39,6 +36,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	{{- range .Volumes }}
 	-v {{ .Name }}:{{ .MountPath }} \
 	{{- end }}
+	{{- if .HTTPProxyFile }}
+	-v {{ .HTTPProxyFile }}:{{ .HTTPProxyFile }}:ro \
+	{{- end }}
 	${SQUID_EXTRA_CONF} --name uyuni-proxy-squid \
 	${UYUNI_IMAGE}'
 

mgrpxy/shared/templates/ssh.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,9 +21,6 @@ After=uyuni-proxy-pod.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-ssh.pid %t/uyuni-proxy-ssh.ctr-id
 
@@ -34,6 +31,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--pod-id-file %t/uyuni-proxy-pod.pod-id -d \
 	--replace -dt \
 	-v /etc/uyuni/proxy:/etc/uyuni:ro \
+	{{- if .HTTPProxyFile }}
+	-v {{ .HTTPProxyFile }}:{{ .HTTPProxyFile }}:ro \
+	{{- end }}
 	--name uyuni-proxy-ssh \
 	${UYUNI_IMAGE}'
 

mgrpxy/shared/templates/tftpd.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -23,9 +23,6 @@ After=uyuni-proxy-pod.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-{{- if .HTTPProxyFile }}
-EnvironmentFile={{ .HTTPProxyFile }}
-{{- end }}
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/uyuni-proxy-tftpd.pid %t/uyuni-proxy-tftpd.ctr-id
 
@@ -39,6 +36,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	{{- range .Volumes }}
 	-v {{ .Name }}:{{ .MountPath }} \
 	{{- end }}
+	{{- if .HTTPProxyFile }}
+	-v {{ .HTTPProxyFile }}:{{ .HTTPProxyFile }}:ro \
+	{{- end }}
 	--name uyuni-proxy-tftpd \
 	${UYUNI_IMAGE}'
 

uyuni-tools.changes.mbussolotto.proxy_env_file

@@ -0,0 +1 @@
+- Read env var from http conf file (bsc#1253282)