mirror of
https://github.com/chatmail/relay.git
synced 2026-06-10 05:31:08 +00:00
docker: rebase again on hpk/tls-external and modify our end
Remove the custom certmon timer (polling via sha1sum every 60s), replaced by the deployer's tls-cert-reload.path unit (inotify). chatmail-init.sh: inject TLS_EXTERNAL_CERT_AND_KEY env var into chatmail.ini at startup if not already present. docker-compose.yaml: remove CMDEPLOY_STAGES, CHATMAIL_NOSYSCTL, TLS_EXTERNAL_CERT_AND_KEY from base environment (set in init script or via override file).
This commit is contained in:
@@ -81,12 +81,6 @@ RUN rm -f /etc/nginx/sites-enabled/default
|
||||
COPY --chmod=555 ./docker/files/chatmail-init.sh /chatmail-init.sh
|
||||
COPY --chmod=555 ./docker/files/entrypoint.sh /entrypoint.sh
|
||||
|
||||
# Certificate monitoring as a proper systemd timer (not a background process)
|
||||
COPY --chmod=555 ./docker/files/chatmail-certmon.sh /chatmail-certmon.sh
|
||||
COPY ./docker/files/chatmail-certmon.service /lib/systemd/system/chatmail-certmon.service
|
||||
COPY ./docker/files/chatmail-certmon.timer /lib/systemd/system/chatmail-certmon.timer
|
||||
RUN ln -sf /lib/systemd/system/chatmail-certmon.timer /etc/systemd/system/timers.target.wants/chatmail-certmon.timer
|
||||
|
||||
HEALTHCHECK --interval=60s --timeout=10s --retries=3 \
|
||||
CMD systemctl is-active dovecot postfix nginx unbound opendkim filtermail doveauth chatmail-metadata || exit 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user