From 6fbe550afecd09cedb56965af29f3d46b4787259 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sun, 13 Jul 2025 22:30:41 +0200
Subject: [PATCH] Solved Database bugs

---
 roles/svc-db-mariadb/config/main.yml  |  2 +-
 roles/svc-db-postgres/config/main.yml | 14 +++++++-------
 roles/svc-db-postgres/tasks/main.yml  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/svc-db-mariadb/config/main.yml b/roles/svc-db-mariadb/config/main.yml
index 1ad11e4a..12a9d5b8 100644
--- a/roles/svc-db-mariadb/config/main.yml
+++ b/roles/svc-db-mariadb/config/main.yml
@@ -1,5 +1,5 @@
 version:  "latest"
 hostname: "svc-db-mariadb"
 network:  "<< defaults_applications[svc-db-mariadb].hostname >>"
-port:     5432
+port:     3306
 volume:   "<< defaults_applications[svc-db-mariadb].hostname >>_data"
\ No newline at end of file
diff --git a/roles/svc-db-postgres/config/main.yml b/roles/svc-db-postgres/config/main.yml
index ccccab66..36d0c90c 100644
--- a/roles/svc-db-postgres/config/main.yml
+++ b/roles/svc-db-postgres/config/main.yml
@@ -3,10 +3,10 @@ network:  "<< defaults_applications[svc-db-postgres].hostname >>"
 port:     5432
 volume:   "<< defaults_applications[svc-db-postgres].hostname >>"
 docker:
-  images:
-    # Postgis is necessary for mobilizon
-    postgres: postgis/postgis
-  versions:  
-    # Please set an version in your inventory file! 
-    # Rolling release isn't recommended
-    postgres: "latest"
+  services:
+    postgres:
+      # Postgis is necessary for mobilizon
+      image: postgis/postgis
+      # Please set an version in your inventory file! 
+      # Rolling release isn't recommended
+      version: "latest"
\ No newline at end of file
diff --git a/roles/svc-db-postgres/tasks/main.yml b/roles/svc-db-postgres/tasks/main.yml
index b726667f..94da551c 100644
--- a/roles/svc-db-postgres/tasks/main.yml
+++ b/roles/svc-db-postgres/tasks/main.yml
@@ -9,7 +9,7 @@
 - name: Install PostgreSQL
   docker_container:
     name: "{{ applications | get_app_conf(application_id, 'hostname', True) }}"
-    image: "{{ applications | get_docker_image(application_id) }}"
+    image: "{{ applications | get_app_conf(application_id, 'docker.services.postgres.image', True) }}:{{ applications | get_app_conf(application_id, 'docker.services.postgres.version', True) }}"
     detach: yes
     env:
       POSTGRES_PASSWORD: "{{ applications | get_app_conf(application_id, 'credentials.postgres_password', True) }}"