From c47f373bc4d183dd297329d51a6285f785afee89 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Tue, 2 Apr 2024 23:39:05 +0200
Subject: [PATCH] healtcheck und depends

---
 docker-compose/lldap/docker-compose.yml.j2 | 12 ++++++++++++
 host_vars/forgejo.mgrote.net.yml           |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docker-compose/lldap/docker-compose.yml.j2 b/docker-compose/lldap/docker-compose.yml.j2
index 17137189..bdc5378a 100644
--- a/docker-compose/lldap/docker-compose.yml.j2
+++ b/docker-compose/lldap/docker-compose.yml.j2
@@ -18,6 +18,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - "lldap:/data"
+    depends_on:
+      - lldap-db
     environment:
       UID: 1000
       GID: 1000
@@ -55,6 +57,16 @@ services:
       MYSQL_INITDB_SKIP_TZINFO: "1"
     networks:
       - intern
+    healthcheck:
+      interval: 30s
+      retries: 3
+      test:
+        [
+          "CMD",
+          "healthcheck.sh",
+          "--connect",
+        ]
+      timeout: 30s
 
 ######## Volumes ########
 volumes:
diff --git a/host_vars/forgejo.mgrote.net.yml b/host_vars/forgejo.mgrote.net.yml
index 9ef80477..def217da 100644
--- a/host_vars/forgejo.mgrote.net.yml
+++ b/host_vars/forgejo.mgrote.net.yml
@@ -57,7 +57,7 @@ gitea_user: "gitea"
 gitea_home: "/var/lib/gitea"
 gitea_user_home: "{{ gitea_home }}"
 # config liegt in /etc/gitea/gitea.ini
-gitea_configuration_path: "/etc/gitea/etc/gitea"
+gitea_configuration_path: "/etc/gitea"
 gitea_app_name: "forgejo"
 gitea_fqdn: "git.mgrote.net"
 # ssh