From b4f580ddae34d26a197e6403a5759489f975a02b Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 8 Jan 2024 09:41:59 +0100 Subject: [PATCH] Optimized mailu setup procedure --- roles/docker-mailu/tasks/main.yml | 5 +++-- roles/docker-mariadb/tasks/main.yml | 2 +- roles/docker-postgres/tasks/main.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index 945297e3..5f4d0fe7 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -69,13 +69,14 @@ - name: wait for database wait_for: host: 127.0.0.1 - port: "{{ http_port }}" + port: 3306 delay: "{{database_delay}}" - timeout: 300 + timeout: 360 when: setup | bool - name: execute database migration command: cmd: "docker compose -p mailu exec admin flask mailu admin admin {{top_domain}} {{mailu_initial_root_password}}" chdir: "{{docker_compose_instance_directory}}" + ignore_errors: true when: setup | bool \ No newline at end of file diff --git a/roles/docker-mariadb/tasks/main.yml b/roles/docker-mariadb/tasks/main.yml index 327ab823..c07971cb 100644 --- a/roles/docker-mariadb/tasks/main.yml +++ b/roles/docker-mariadb/tasks/main.yml @@ -43,7 +43,7 @@ host: 127.0.0.1 port: 3306 delay: "{{database_delay}}" - timeout: 300 + timeout: 360 when: run_once_docker_mariadb is not defined - name: "Create database: {{ database_name }}" diff --git a/roles/docker-postgres/tasks/main.yml b/roles/docker-postgres/tasks/main.yml index 98306096..69b8fa29 100644 --- a/roles/docker-postgres/tasks/main.yml +++ b/roles/docker-postgres/tasks/main.yml @@ -32,7 +32,7 @@ host: "127.0.0.1" port: "5432" delay: "{{database_delay}}" - timeout: 300 + timeout: 360 when: run_once_docker_postgres is not defined - name: install python-psycopg2