From 983fefe38378b80587619c01e64f2fbcb3e52206 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 25 Jan 2023 05:54:38 +0000 Subject: [PATCH] grafana: Better handling for stopping service --- .../grafana/templates/grafana-container.service.j2 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/grafana/templates/grafana-container.service.j2 b/roles/grafana/templates/grafana-container.service.j2 index 22ae5f2..98311d6 100644 --- a/roles/grafana/templates/grafana-container.service.j2 +++ b/roles/grafana/templates/grafana-container.service.j2 @@ -1,17 +1,22 @@ [Unit] Description=Grafana Container +Wants=network-online.target +After=network-online.target + [Service] User=grafana EnvironmentFile=/etc/sysconfig/grafana-container -ExecStart=/usr/bin/podman run --rm -p 127.0.0.1:8002:3000 --name grafana \ +ExecStart=/usr/bin/podman run \ + --rm -p 127.0.0.1:8002:3000 \ + --name grafana \ --volume={{ tls_certs }}/ca.crt:/etc/ssl/certs/ca.crt:ro \ --volume={{ tls_certs }}/{{ inventory_hostname }}.crt:/etc/ssl/certs/{{ inventory_hostname }}.crt:ro \ --volume={{ tls_private }}/grafana.key:/etc/ssl/private/{{ inventory_hostname }}.key:ro \ --volume=/etc/grafana-ldap.toml:/etc/grafana/ldap.toml:ro \ - --env=GF_* docker.io/grafana/grafana:{{ grafana_version }} -ExecStop=/usr/bin/podman stop grafana -KillMode=none + --env=GF_* docker.io/grafana/grafana:{{ grafana_version }} +ExecStop=/usr/bin/podman stop --ignore grafana +ExecStopPost=/usr/bin/podman rm -f --ignore grafana [Install] WantedBy=multi-user.target