From fb2578d28a12c26494905d87ec61a92838189eeb Mon Sep 17 00:00:00 2001 From: il Date: Thu, 25 Jun 2026 10:58:07 +0900 Subject: [PATCH] refactor(ldap, grafana, nextcloud): clarify dependency on service file --- config/services/containers/app/nextcloud/nextcloud.container.j2 | 1 + config/services/containers/infra/grafana/grafana.container.j2 | 2 ++ config/services/containers/infra/ldap/ldap.container.j2 | 1 + 3 files changed, 4 insertions(+) diff --git a/config/services/containers/app/nextcloud/nextcloud.container.j2 b/config/services/containers/app/nextcloud/nextcloud.container.j2 index 4973c6c..79edc29 100644 --- a/config/services/containers/app/nextcloud/nextcloud.container.j2 +++ b/config/services/containers/app/nextcloud/nextcloud.container.j2 @@ -31,6 +31,7 @@ Environment="REDIS_HOST=host.containers.internal" Environment="REDIS_HOST_PORT={{ services['nextcloud']['ports']['redis'] }}" [Service] +ExecStartPre=/usr/bin/nc -zv {{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }} {{ services['postgresql']['ports']['tcp'] }} Restart=always RestartSec=10s TimeoutStopSec=120 diff --git a/config/services/containers/infra/grafana/grafana.container.j2 b/config/services/containers/infra/grafana/grafana.container.j2 index 5319fa7..a2d485d 100644 --- a/config/services/containers/infra/grafana/grafana.container.j2 +++ b/config/services/containers/infra/grafana/grafana.container.j2 @@ -35,6 +35,8 @@ Secret=LDAP_BIND_PASSWORD,target=/run/secrets/LDAP_BIND_PASSWORD Secret=GF_ADMIN_PASSWORD,target=/run/secrets/GF_ADMIN_PASSWORD [Service] +ExecStartPre=/usr/bin/nc -zv {{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }} {{ services['postgresql']['ports']['tcp'] }} +ExecStartPre=/usr/bin/nc -zv {{ services['ldap']['domain']['internal'] }}.{{ domain['internal'] }} 636 Restart=always RestartSec=10s TimeoutStopSec=120 diff --git a/config/services/containers/infra/ldap/ldap.container.j2 b/config/services/containers/infra/ldap/ldap.container.j2 index ffe0d92..62a7b7d 100644 --- a/config/services/containers/infra/ldap/ldap.container.j2 +++ b/config/services/containers/infra/ldap/ldap.container.j2 @@ -56,6 +56,7 @@ Secret=LLDAP_KEY_SEED,target="/run/secrets/LLDAP_KEY_SEED" Secret=LLDAP_JWT_SECRET,target="/run/secrets/LLDAP_JWT_SECRET" [Service] +ExecStartPre=/usr/bin/nc -zv {{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }} {{ services['postgresql']['ports']['tcp'] }} Restart=always RestartSec=10s TimeoutStopSec=120