From 3f4592146ac04a80e113a6053d4beec081249a16 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 26 Dec 2023 03:36:29 +0100 Subject: [PATCH] Solved bugs --- roles/docker-gitea/templates/docker-compose.yml.j2 | 2 ++ roles/docker-gitea/vars/main.yml | 2 +- roles/docker-mailu/templates/docker-compose.yml.j2 | 3 ++- roles/docker-pixelfed/vars/main.yml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2 index d437ec53..568826cb 100644 --- a/roles/docker-gitea/templates/docker-compose.yml.j2 +++ b/roles/docker-gitea/templates/docker-compose.yml.j2 @@ -31,7 +31,9 @@ services: - /etc/localtime:/etc/localtime:ro depends_on: - database + {% include 'templates/docker-mariadb-service.yml.j2' %} + volumes: database: data: diff --git a/roles/docker-gitea/vars/main.yml b/roles/docker-gitea/vars/main.yml index 71b2d12c..be3540d8 100644 --- a/roles/docker-gitea/vars/main.yml +++ b/roles/docker-gitea/vars/main.yml @@ -1,6 +1,6 @@ docker_compose_instance_directory: "{{path_docker_compose_instances}}gitea/" database_instance: "gitea" -database_host: "{{database_instance}}" +database_host: "database" database_databasename: "{{database_instance}}" database_username: "{{database_instance}}" database_password: "{{gitea_database_password}}" \ No newline at end of file diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2 index 28105fc4..4144bed5 100644 --- a/roles/docker-mailu/templates/docker-compose.yml.j2 +++ b/roles/docker-mailu/templates/docker-compose.yml.j2 @@ -21,7 +21,8 @@ services: dns: - 192.168.203.254 -{% include 'templates/docker-mariadb-service.yml.j2' %} +{% include 'templates/docker-mariadb-service.yml.j2' %} + depends_on: - resolver dns: diff --git a/roles/docker-pixelfed/vars/main.yml b/roles/docker-pixelfed/vars/main.yml index 784e64d4..b1ef296b 100644 --- a/roles/docker-pixelfed/vars/main.yml +++ b/roles/docker-pixelfed/vars/main.yml @@ -1,7 +1,7 @@ docker_compose_instance_directory: "{{path_docker_compose_instances}}pixelfed/" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;" database_instance: "pixelfed" -database_host: "{{database_instance}}" +database_host: "database" database_databasename: "{{database_instance}}" database_username: "{{database_instance}}" database_password: "{{pixelfed_database_password}}"