Skip to content

fix(systemd): replace %S with %E in unit files #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidePrincipi merged 1 commit into from
Jul 28, 2026
Merged

fix(systemd): replace %S with %E in unit files #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion imageroot/systemd/user/clamav-unofficial-sigs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ After=clamav.service
[Service]
Type=oneshot
ExecStart=podman exec clamav download-sigs cus -s
WorkingDirectory=%S/state
WorkingDirectory=%E/state
SyslogIdentifier=%N
4 changes: 2 additions & 2 deletions imageroot/systemd/user/clamav.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Description=ClamAV anti-virus
Environment=PODMAN_SYSTEMD_UNIT=%n
Environment=CLAMAV_CUSCFG_VOLUME_FLAGS=O
Environment=CLAMAV_CUS_RATING=MEDIUM
EnvironmentFile=%S/state/environment
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
WorkingDirectory=%E/state
Restart=always
ExecStartPre=/bin/rm -f %t/clamav.pid %t/clamav.ctr-id
ExecStart=/usr/bin/podman run \
Expand Down
2 changes: 1 addition & 1 deletion imageroot/systemd/user/dhgen.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Description=Diffie-Hellman group generator
Type=oneshot
ExecStart=runagent generate-dhpem
ExecStart=-systemctl --user reload postfix.service dovecot.service
WorkingDirectory=%S/state
WorkingDirectory=%E/state
SyslogIdentifier=%N
4 changes: 2 additions & 2 deletions imageroot/systemd/user/dovecot.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ After=get-certificate.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=%S/state/environment
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
WorkingDirectory=%E/state
Restart=always
ExecStartPre=/bin/rm -f %t/dovecot.pid %t/dovecot.ctr-id
ExecStartPre=runagent discover-services
Expand Down
2 changes: 1 addition & 1 deletion imageroot/systemd/user/freshclam.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ After=clamav.service
[Service]
Type=oneshot
ExecStart=podman exec clamav download-sigs freshclam
WorkingDirectory=%S/state
WorkingDirectory=%E/state
SyslogIdentifier=%N
4 changes: 2 additions & 2 deletions imageroot/systemd/user/get-certificate.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Description=Get TLS certificate from Traefik
[Service]
Type=oneshot
SuccessExitStatus=0,3
EnvironmentFile=%S/state/environment
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
WorkingDirectory=%E/state
SyslogIdentifier=%N
ExecStart=-mkdir -vp tls-certs
ExecStart=-runagent get-certificate --cert-file=tls-certs/server.pem --key-file=tls-certs/server.key $POSTFIX_HOSTNAME
Expand Down
4 changes: 2 additions & 2 deletions imageroot/systemd/user/postfix.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Wants=get-certificate.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=%S/state/environment
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
WorkingDirectory=%E/state
Restart=always
ExecStartPre=/bin/rm -f %t/postfix.pid %t/postfix.ctr-id
ExecStartPre=/bin/mkdir -vp pcdb
Expand Down
6 changes: 3 additions & 3 deletions imageroot/systemd/user/rspamd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[Unit]
Description=Rspamd mail filter
ConditionPathExists=%S/state/rspamd.env
ConditionPathExists=%E/state/rspamd.env

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=%S/state/environment
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
WorkingDirectory=%E/state
Restart=always
ExecStartPre=/bin/rm -f %t/rspamd.pid %t/rspamd.ctr-id
ExecStartPre=runagent discover-services
Expand Down
2 changes: 1 addition & 1 deletion imageroot/systemd/user/spam-expunge.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Requisite=dovecot.service
[Service]
Type=oneshot
ExecStart=podman exec dovecot spam-expunge
WorkingDirectory=%S/state
WorkingDirectory=%E/state
SyslogIdentifier=%N
Loading