From 84ec0c13cc700c757e401879391552ed2abcca1d Mon Sep 17 00:00:00 2001 From: Christian Hagenest Date: Sun, 19 May 2024 11:41:40 +0200 Subject: [PATCH] systemd-metrics ready to test --- cmdeploy/src/cmdeploy/__init__.py | 23 +++++++++++-------- .../src/cmdeploy/service/metrics.service.j2 | 3 +-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index fdc55939..0ed96bae 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -85,9 +85,19 @@ def _install_remote_venv_with_chatmaild(config) -> None: ], ) + # create metrics every 5 minutes via systemd + + files.put( + name="Upload metrics.timer", + src=importlib.resources.files(__package__).joinpath("service/metrics.timer"), + dest=f"/etc/systemd/system/metrics.timer", + **root_owned, + ) + files.template( - src=importlib.resources.files(__package__).joinpath("metrics.cron.j2"), - dest="/etc/cron.d/chatmail-metrics", + name="upload metrics.service" + src=importlib.resources.files(__package__).joinpath("service/metrics.service.j2"), + dest="/etc/systemd/system/metrics.service", user="root", group="root", mode="644", @@ -97,20 +107,15 @@ def _install_remote_venv_with_chatmaild(config) -> None: }, ) - # create metrics every 5 minutes via systemd - systemd.service( - name=f"Setup metrics service", - service="metrics.service", + name=f"Setup metrics timer", + service="metrics.timer", running=True, enabled=True, restarted=True, daemon_reload=True, ) - # TODO Put a systemd service at the right place - # TODO Put a systemd timer at the right place - # install systemd units for fn in ( "doveauth", diff --git a/cmdeploy/src/cmdeploy/service/metrics.service.j2 b/cmdeploy/src/cmdeploy/service/metrics.service.j2 index 71e02f7d..4aa7274d 100644 --- a/cmdeploy/src/cmdeploy/service/metrics.service.j2 +++ b/cmdeploy/src/cmdeploy/service/metrics.service.j2 @@ -2,5 +2,4 @@ Description=Generate metrics in /var/www/html/metrics every 5 minutes [Service] -WorkingDirectory=/var/www/magento-website/current -ExecStart=/usr/bin/php bin/magento indexer:reindex +ExecStart={{ config.execpath }} /home/vmail/mail/{{ config.mail_domain }} >/var/www/html/metrics