From 9051ba179fad2ff3084a4d73dccd8ffcb7e36f18 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Thu, 4 Dec 2025 14:10:53 +0100
Subject: [PATCH] Optimized ESPOCRM and Moodle volumes

---
 roles/web-app-matomo/config/main.yml                 | 2 +-
 roles/web-app-moodle/config/main.yml                 | 4 ++--
 roles/web-app-moodle/templates/docker-compose.yml.j2 | 3 +--
 roles/web-app-moodle/templates/env.j2                | 6 +++---
 roles/web-app-moodle/vars/main.yml                   | 5 ++++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/roles/web-app-matomo/config/main.yml b/roles/web-app-matomo/config/main.yml
index ec376144..43428618 100644
--- a/roles/web-app-matomo/config/main.yml
+++ b/roles/web-app-matomo/config/main.yml
@@ -46,4 +46,4 @@ docker:
     redis:
       enabled: false
   volumes: 
-    data: MATOMO_DATA 
+    data: matomo_data
diff --git a/roles/web-app-moodle/config/main.yml b/roles/web-app-moodle/config/main.yml
index 310b3124..56d5dd44 100644
--- a/roles/web-app-moodle/config/main.yml
+++ b/roles/web-app-moodle/config/main.yml
@@ -36,6 +36,6 @@ docker:
       image:          bitnamilegacy/moodle
       name:           moodle
   volumes:
-    data:             MOODLE_DATA
-    code:             MOODLE_CODE
+    data:             moodle_data
+    code:             moodle_code
   
diff --git a/roles/web-app-moodle/templates/docker-compose.yml.j2 b/roles/web-app-moodle/templates/docker-compose.yml.j2
index ec976de9..bc55a56c 100644
--- a/roles/web-app-moodle/templates/docker-compose.yml.j2
+++ b/roles/web-app-moodle/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@
 {% set container_port = 8080 %}
     container_name: {{ MOODLE_CONTAINER }}
     {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
-    image: MOODLE_CUSTOM
+    image: {{ MOODLE_IMAGE_CUSTOM }}
     ports:
       - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
@@ -22,4 +22,3 @@
     name: {{ MOODLE_VOLUME_DATA }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
-  
\ No newline at end of file
diff --git a/roles/web-app-moodle/templates/env.j2 b/roles/web-app-moodle/templates/env.j2
index afefd726..dcec8ee9 100644
--- a/roles/web-app-moodle/templates/env.j2
+++ b/roles/web-app-moodle/templates/env.j2
@@ -1,12 +1,12 @@
 
 # General 
-MOODLE_SITE_NAME="{{ applications | get_app_conf(application_id, 'site_titel', True) }}"
+MOODLE_SITE_NAME="{{ applications | get_app_conf(application_id, 'site_titel') }}"
 MOODLE_HOST="{{ domains | get_domain(application_id) }}"
 MOODLE_SSLPROXY=yes
 MOODLE_REVERSE_PROXY=yes
 MOODLE_USERNAME={{ applications | get_app_conf(application_id, 'users.administrator.username') }}
-MOODLE_PASSWORD={{ applications | get_app_conf(application_id, 'credentials.user_password', True)}}
-MOODLE_EMAIL={{ applications | get_app_conf(application_id, 'users.administrator.email', True)}}
+MOODLE_PASSWORD={{ applications | get_app_conf(application_id, 'credentials.user_password')}}
+MOODLE_EMAIL={{ applications | get_app_conf(application_id, 'users.administrator.email')}}
 BITNAMI_DEBUG={% if MODE_DEBUG | bool %}true{% else %}false{% endif %}
 
 # Database
diff --git a/roles/web-app-moodle/vars/main.yml b/roles/web-app-moodle/vars/main.yml
index 758a35e9..6e4bb2dc 100644
--- a/roles/web-app-moodle/vars/main.yml
+++ b/roles/web-app-moodle/vars/main.yml
@@ -1,6 +1,7 @@
 ---
 application_id:                 "web-app-moodle"
 database_type:                  "mariadb"
+entity_name:                    "{{ application_id | get_entity_name }}"
 
 BITNAMI_CODE_LINK:              "/bitnami/moodle"
 BITNAMI_CODE_DIR:               "{{ ['/opt', BITNAMI_CODE_LINK ] | path_join }}"
@@ -10,8 +11,10 @@ BITNAMI_USER:                   "daemon"
 BITNAMI_USER_GROUP:             "{{ BITNAMI_USER }}:{{ BITNAMI_USER }}"
 
 MOODLE_CONFIG:                  "/bitnami/moodle/config.php"
+MOODLE_IMAGE_CUSTOM:            "{{ entity_name }}_custom"
 MOODLE_VERSION:                 "{{ applications | get_app_conf(application_id, 'docker.services.moodle.version') }}"
 MOODLE_IMAGE:                   "{{ applications | get_app_conf(application_id, 'docker.services.moodle.image') }}"
 MOODLE_CONTAINER:               "{{ applications | get_app_conf(application_id, 'docker.services.moodle.name') }}"
 MOODLE_VOLUME_DATA:             "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
-MOODLE_VOLUME_CODE:             "{{ applications | get_app_conf(application_id, 'docker.volumes.code') }}"
\ No newline at end of file
+MOODLE_VOLUME_CODE:             "{{ applications | get_app_conf(application_id, 'docker.volumes.code') }}"
+                    
\ No newline at end of file