Skip to content

Commit 43dfbd9

Browse files
committed
fix(smarthost): correct environment file reference and update discover command argument
1 parent 442a9c4 commit 43dfbd9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

imageroot/systemd/user/phpfpm@.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
99
EnvironmentFile=%S/state/environment
1010
EnvironmentFile=%S/state/image_url_tag.env
1111
WorkingDirectory=%S/state
12-
EnvironmentFile=-%S/state/smarthost.env
12+
EnvironmentFile=-%S/state/php%i_smarthost.env
1313
Restart=always
1414
TimeoutStopSec=70
1515
ExecStartPre=/bin/rm -f %t/php%i-fpm.pid %t/php%i-fpm.ctr-id
1616
ExecStartPre=/usr/bin/mkdir -p %S/state/php%i-fpm-custom.d
17-
ExecStartPre=-runagent discover-smarthost
17+
ExecStartPre=-runagent discover-smarthost %i
1818
ExecStart=/usr/bin/podman run --conmon-pidfile %t/php%i-fpm.pid \
1919
--cidfile %t/php%i-fpm.ctr-id --cgroups=no-conmon \
2020
--pod-id-file %t/webserver.pod-id --replace -d --name php%i-fpm \

0 commit comments

Comments
 (0)