Skip to content

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

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

Open
DavidePrincipi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

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
8 changes: 4 additions & 4 deletions imageroot/systemd/user/pgadmin-app.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ After=postgresql.service pgadmin-app.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=%S/state/environment
EnvironmentFile=-%S/state/smarthost.env
WorkingDirectory=%S/state
EnvironmentFile=%E/state/environment
EnvironmentFile=-%E/state/smarthost.env
WorkingDirectory=%E/state
Restart=always
TimeoutStopSec=70
ExecStartPre=/bin/mkdir -p config
Expand All @@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/pgadmin-app.pid \
--env 'PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED=False' \
--env 'PGADMIN_CONFIG_LOGIN_BANNER="Authorised users only!"' \
--env 'PGADMIN_CONFIG_CONSOLE_LOG_LEVEL=40' \
--env-file=%S/state/smarthost.env \
--env-file=%E/state/smarthost.env \
${PGADMIN4_IMAGE}
ExecStartPost=/usr/bin/bash -c "while ! podman exec pgadmin-app /venv/bin/python3 setup.py get-users ; do sleep 5 ; done"
ExecStartPost=/usr/bin/podman cp pgpass pgadmin-app:/var/lib/pgadmin/pgpass
Expand Down
6 changes: 3 additions & 3 deletions imageroot/systemd/user/postgresql-app.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ After=postgresql.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=%S/state/environment
EnvironmentFile=%S/state/secrets/passwords.env
EnvironmentFile=%E/state/environment
EnvironmentFile=%E/state/secrets/passwords.env
Restart=always
TimeoutStopSec=70
ExecStartPre=/bin/rm -f %t/postgresql-app.pid %t/postgresql-app.ctr-id
ExecStart=/usr/bin/podman run --conmon-pidfile %t/postgresql-app.pid \
--cidfile %t/postgresql-app.ctr-id --cgroups=no-conmon \
--pod-id-file %t/postgresql.pod-id --replace -d --name postgresql-app \
--env-file=%S/state/environment \
--env-file=%E/state/environment \
--volume pgdata:/var/lib/postgresql/data:Z \
--volume socket:/var/run/postgresql:z \
--env POSTGRES_USER=postgres \
Expand Down
2 changes: 1 addition & 1 deletion imageroot/systemd/user/postgresql.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Before=pgadmin-app.service postgresql-app.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=-%S/state/environment
EnvironmentFile=-%E/state/environment
Restart=always
TimeoutStopSec=70
ExecStartPre=/bin/rm -f %t/postgresql.pid %t/postgresql.pod-id
Expand Down
Loading