Add SMTP configuration and environment support by stephdl · Pull Request #129 · NethServer/ns8-webserver

stephdl · 2026-02-09T09:41:43Z

Introduce a script to discover SMTP settings and create an environment file for smarthost configuration. Update the container setup to include OpenSSL and ensure the service can access the new SMTP environment variables.

NethServer/dev#7859

…riables

…ted function

Updated copyright year from 2023 to 2026.

…to README

DavidePrincipi

Since discover-smarthost runs under multiple unit instances, separate temporary files are required to avoid conflicts when smarthost.env is written.

README.md

imageroot/bin/discover-smarthost

…nd add argument check

…igurations

…r command argument

… directory

Co-authored-by: Davide Principi <davide.principi@nethesis.it>

…ument requirement

DavidePrincipi

LGTM

Copilot

Pull request overview

Adds smarthost/SMTP settings discovery to the webserver module so php-fpm containers can consume centrally-managed SMTP configuration, and updates the container/runtime setup accordingly (issue: NethServer/dev#7859).

Changes:

Add discover-smarthost script to read smarthost settings from Redis and generate an SMTP environment file.
Update phpfpm@.service to load the new env file and attempt to pass SMTP variables into the php-fpm container; add an event handler to restart php-fpm on smarthost changes.
Install openssl in the PHP images and refactor build-images.sh to reduce duplication.

Reviewed changes

Copilot reviewed 5 out of 6 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
imageroot/systemd/user/phpfpm@.service	Loads optional smarthost env file, runs discovery pre-start, and attempts to forward SMTP env vars into the container.
imageroot/events/smarthost-changed/10restart_phpfpm	New handler to restart configured php-fpm instances when smarthost changes.
imageroot/bin/discover-smarthost	New script to generate `smarthost.env` from Redis smarthost settings.
container/Containerfile	Adds `openssl` to runtime packages.
build-images.sh	Refactors repeated image builds into a function.
README.md	Documents smarthost discovery behavior and environment propagation.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-16T16:15:24Z

imageroot/systemd/user/phpfpm@.service

 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


ExecStartPre=-runagent discover-smarthost uses runagent without an absolute path, while other units (e.g. nginx.service) use /usr/local/bin/runagent. In systemd units the PATH can be minimal, so this may fail with “runagent: not found”; use the same absolute path consistently.

Suggested change

ExecStartPre=-runagent discover-smarthost

ExecStartPre=-/usr/local/bin/runagent discover-smarthost

Copilot · 2026-02-16T16:15:24Z

imageroot/systemd/user/phpfpm@.service

    --pod-id-file %t/webserver.pod-id --replace -d --name  php%i-fpm \
    --volume websites:/var/www/html:z \
    --volume %S/state/php%i-fpm-custom.d:/usr/local/etc/php-fpm.d:z \
+    --env SMTP_* \


podman run --env SMTP_* will pass a literal variable name SMTP_* (systemd does not do shell glob expansion for ExecStart arguments, and * is not a valid env var name). As a result, SMTP variables won’t be propagated into the container. Prefer --env-file pointing to the generated env file, or explicitly list each SMTP_... variable to forward.

Suggested change

--env SMTP_* \

--env-file %S/state/smarthosts/smarthost.env \

Copilot · 2026-02-16T16:15:25Z

imageroot/events/smarthost-changed/10restart_phpfpm

+    ListConfigurations = glob.glob(folder+'/dyn-*.conf')
+    if ListConfigurations :
+        subprocess.run(["download-php-fpm",ConfiguredServices[0].replace('php','')])
+        subprocess.run(["systemctl", "--user", "restart", "phpfpm@"+ConfiguredServices[0].replace('php','')+".service"])


This handler assumes re.findall(...) always returns at least one match and then indexes ConfiguredServices[0]; if the folder name format ever differs, this will raise IndexError. Also, subprocess.run(...) results are ignored, so a failed download/restart won’t be detected. Add a guard for empty matches and run subprocesses with error handling (e.g. check=True or inspecting returncode).

Suggested change

ListConfigurations = glob.glob(folder+'/dyn-*.conf')

if ListConfigurations :

subprocess.run(["download-php-fpm",ConfiguredServices[0].replace('php','')])

subprocess.run(["systemctl", "--user", "restart", "phpfpm@"+ConfiguredServices[0].replace('php','')+".service"])

if not ConfiguredServices:

# Skip folders that do not match the expected php version pattern

continue

php_version = ConfiguredServices[0].replace('php', '')

ListConfigurations = glob.glob(folder + '/dyn-*.conf')

if ListConfigurations:

try:

subprocess.run(["download-php-fpm", php_version], check=True)

subprocess.run(

["systemctl", "--user", "restart", f"phpfpm@{php_version}.service"],

check=True,

)

except subprocess.CalledProcessError as e:

print(f"Error handling php-fpm service for {php_version}: {e}", flush=True)

Copilot · 2026-02-16T16:15:25Z

README.md

+`phpfpm@.service` starts, the command `bin/discover-smarthost` runs and refreshes
+the `state/smarthost.env` file with fresh values from Redis.
+
+Furthermore if smarthost setup is changed when webserver is already
+running, the event handler `events/smarthost-changed/10reload_services`


Documentation doesn’t match the implementation: the unit references state/smarthosts/smarthost.env (and discover-smarthost writes under smarthosts/), but the README mentions state/smarthost.env. Also, the documented handler name events/smarthost-changed/10reload_services doesn’t exist in this PR (added file is 10restart_phpfpm). Update the paths/names to reflect the actual files.

Copilot · 2026-02-16T16:15:25Z

README.md

+- `state/smarthost.env` - SMTP and smarthost configuration (optional, prefixed with `SMTP_`)
+
+These environment variables are automatically passed to the corresponding PHP-FPM container instance, allowing configuration to be centrally managed through environment files that apply to all PHP versions (8.5, 8.4, 8.3, etc.).
+This setting discovery is just an example to understand how the module is expected to work:
+```
+cat smarthost.env 


This list item and the example cat smarthost.env command don’t reflect where the file is actually created/loaded (the unit uses state/smarthosts/smarthost.env). Update the bullet and example command/path to match the real location.

Copilot · 2026-02-16T16:15:25Z

imageroot/systemd/user/phpfpm@.service

 EnvironmentFile=%S/state/environment
 EnvironmentFile=%S/state/image_url_tag.env
 WorkingDirectory=%S/state
+EnvironmentFile=-%S/state/smarthosts/smarthost.env


EnvironmentFile is evaluated before any ExecStartPre commands run, so the file generated by ExecStartPre=...discover-smarthost will not be loaded into the unit environment for this start. To ensure fresh values are used, either pass the generated file directly to Podman (e.g., via --env-file), or generate/update the env file in a separate unit that runs before phpfpm@.service starts.

stephdl added 10 commits February 9, 2026 10:37

feat(smarthost): add discover-smarthost script for SMTP configuration

c0582a0

fix(container): add openssl installation to Containerfile

fb735d1

feat(service): add smarthost environment file and SMTP environment va…

d16c662

…riables

feat(smarthost): add script to reload lamp service on smarthost changes

6205660

refactor(build-images): streamline PHP FPM image builds with a dedica…

dd690cf

…ted function

Update copyright year in discover-smarthost

0915f2b

Update copyright year in 10reload_services

2f522a3

Updated copyright year from 2023 to 2026.

Add runagent discover-smarthost to ExecStartPre

4def4d5

fix(smarthost): update service name to webserver in reload script

7b31f6c

docs(smarthost): add discovery settings and environment file details …

232c0b2

…to README

stephdl mentioned this pull request Feb 10, 2026

Feature: SMTP configuration and environment support for ns8-webserver NethServer/dev#7859

Open

stephdl requested a review from DavidePrincipi February 10, 2026 15:55

Fix typo in README regarding webserver

8d5e840

DavidePrincipi requested changes Feb 16, 2026

View reviewed changes

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

imageroot/bin/discover-smarthost Outdated Show resolved Hide resolved

stephdl and others added 5 commits February 16, 2026 11:12

fix(discover-smarthost): update envfile naming to include PHP value a…

109370d

…nd add argument check

feat(smarthost): add script to restart PHP-FPM services based on conf…

442a9c4

…igurations

fix(smarthost): correct environment file reference and update discove…

43dfbd9

…r command argument

fix(smarthost): update environment file paths to include 'smarthosts'…

93914a1

… directory

Apply suggestions from code review

a16d9dc

Co-authored-by: Davide Principi <davide.principi@nethesis.it>

stephdl requested a review from DavidePrincipi February 16, 2026 13:15

fix(smarthost): simplify environment file handling and remove PHP arg…

6232e3a

…ument requirement

DavidePrincipi approved these changes Feb 16, 2026

View reviewed changes

DavidePrincipi requested a review from Copilot February 16, 2026 16:07

Copilot started reviewing on behalf of DavidePrincipi February 16, 2026 16:07 View session

Copilot AI reviewed Feb 16, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SMTP configuration and environment support#129

Add SMTP configuration and environment support#129
stephdl wants to merge 17 commits intomainfrom
sdl-smarthost

stephdl commented Feb 9, 2026 •

edited

Loading

Uh oh!

DavidePrincipi left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DavidePrincipi left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Copilot AI Feb 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	ExecStartPre=-runagent discover-smarthost
	ExecStartPre=-/usr/local/bin/runagent discover-smarthost

	--env SMTP_* \
	--env-file %S/state/smarthosts/smarthost.env \

-    ListConfigurations = glob.glob(folder+'/dyn-*.conf')
-    if ListConfigurations :
-        subprocess.run(["download-php-fpm",ConfiguredServices[0].replace('php','')])
-        subprocess.run(["systemctl", "--user", "restart", "phpfpm@"+ConfiguredServices[0].replace('php','')+".service"])
+    if not ConfiguredServices:
+        # Skip folders that do not match the expected php version pattern
+        continue
+    php_version = ConfiguredServices[0].replace('php', '')
+    ListConfigurations = glob.glob(folder + '/dyn-*.conf')
+    if ListConfigurations:
+        try:
+            subprocess.run(["download-php-fpm", php_version], check=True)
+            subprocess.run(
+                ["systemctl", "--user", "restart", f"phpfpm@{php_version}.service"],
+                check=True,
+            )
+        except subprocess.CalledProcessError as e:
+            print(f"Error handling php-fpm service for {php_version}: {e}", flush=True)

Conversation

stephdl commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DavidePrincipi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DavidePrincipi left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

stephdl commented Feb 9, 2026 •

edited

Loading