From 2a0ea7a9bd7b7c274d7f2dcd1028c2863fe49d05 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 21 Nov 2024 12:37:45 +0100 Subject: [PATCH] fix(event): try to reload postfix for user-domain-changed --- imageroot/events/user-domain-changed/20configure_ldap | 5 ++--- imageroot/systemd/user/postfix.service | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/imageroot/events/user-domain-changed/20configure_ldap b/imageroot/events/user-domain-changed/20configure_ldap index 73f4c647..6d041ab8 100755 --- a/imageroot/events/user-domain-changed/20configure_ldap +++ b/imageroot/events/user-domain-changed/20configure_ldap @@ -18,6 +18,5 @@ if event.get('domain') != os.getenv('POSTFIX_ORIGIN'): if 'node_id' in event and str(event['node_id']) != os.getenv('NODE_ID'): exit(0) # ignore event if the source is not in our node -agent.run_helper('systemctl', '--user', '-T', 'try-reload-or-restart', 'dovecot.service').check_returncode() -# restart postfix to apply the new domain, a reload is not enough when we migrate from one domain to another -agent.run_helper('systemctl', '--user', '-T', 'try-restart', 'postfix.service').check_returncode() +agent.run_helper('systemctl', '--user', '-T', 'try-reload-or-restart', 'dovecot.service', 'postfix.service').check_returncode() + diff --git a/imageroot/systemd/user/postfix.service b/imageroot/systemd/user/postfix.service index 7a444329..e9b7f3ce 100644 --- a/imageroot/systemd/user/postfix.service +++ b/imageroot/systemd/user/postfix.service @@ -28,7 +28,7 @@ ExecStart=/usr/bin/podman run \ ${MAIL_POSTFIX_IMAGE} ExecStop=/usr/bin/podman stop --ignore --cidfile %t/postfix.ctr-id -t 60 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/postfix.ctr-id -ExecReload=runagent /usr/bin/podman exec --env=POSTFIX_* %N reload-config +ExecReload=runagent /usr/bin/podman exec --env-file=discovery.env --env=POSTFIX_* %N reload-config PIDFile=%t/postfix.pid Type=forking SyslogIdentifier=%N