fix(smarthost): simplify environment file handling and remove PHP argument requirement

Author: stephdl

imageroot/bin/discover-smarthost

@@ -5,31 +5,24 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-import sys
 import agent
 import os
 
-# retrieve the first argument as the php value
-if len(sys.argv) <= 1:
-    print("Error: Missing argument for PHP value", file=sys.stderr)
-    sys.exit(1)
-php_value = sys.argv[1]
-
 # Connect the local Redis replica. This is necessary to consistently start
 # the service if the leader node is not reachable:
 rdb = agent.redis_connect(use_replica=True)
 smtp_settings = agent.get_smarthost_settings(rdb)
 
 # create the smarthost folder
-envfile = f'smarthosts/php{php_value}_smarthost.env'
+envfile = 'smarthosts/smarthost.env'
 
 # Ensure the target directory exists:
 os.makedirs(os.path.dirname(envfile), exist_ok=True)
 
+# Create a unique temporary file using process PID to avoid concurrent writes:
+tmp_path = f"{envfile}.tmp.{os.getpid()}"
 
-# Using .tmp suffix: do not overwrite the target file until the new one is
-# saved to disk:
-with open(envfile + ".tmp", "w") as efp:
+with open(tmp_path, "w") as efp:
     # HINT for lamp: adjust variable names as needed
     print(f"SMTP_ENABLED={'1' if smtp_settings['enabled'] else ''}", file=efp)
     print(f"SMTP_HOST={smtp_settings['host']}", file=efp)
@@ -39,5 +32,5 @@ with open(envfile + ".tmp", "w") as efp:
     print(f"SMTP_ENCRYPTION={smtp_settings['encrypt_smtp']}", file=efp)
     print(f"SMTP_TLSVERIFY={'1' if smtp_settings['tls_verify'] else ''}", file=efp)
 
-# Commit changes by replacing the existing envfile:
-os.replace(envfile + ".tmp", envfile)
+# Commit changes by atomically replacing the existing envfile:
+os.replace(tmp_path, envfile)

imageroot/systemd/user/phpfpm@.service

@@ -9,12 +9,12 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
 EnvironmentFile=%S/state/environment
 EnvironmentFile=%S/state/image_url_tag.env
 WorkingDirectory=%S/state
-EnvironmentFile=-%S/state/smarthosts/php%i_smarthost.env
+EnvironmentFile=-%S/state/smarthosts/smarthost.env
 Restart=always
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/php%i-fpm.pid %t/php%i-fpm.ctr-id
 ExecStartPre=/usr/bin/mkdir -p %S/state/php%i-fpm-custom.d
-ExecStartPre=-runagent discover-smarthost %i
+ExecStartPre=-runagent discover-smarthost
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/php%i-fpm.pid \
     --cidfile %t/php%i-fpm.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/webserver.pod-id --replace -d --name  php%i-fpm \