Huge role refactoring/cleanup. Other commits will propably follow. Because some bugs will exist. Still important for longrun and also for auto docs/help/slideshow generation

roles/docker-compose/README.md

@@ -20,7 +20,7 @@ To offer a centralized, extensible system for managing containerized application
 - **Reset Logic:** Cleans previous Compose project files and data when `mode_reset` is enabled.
 - **Handlers for Runtime Control:** Automatically builds, sets up, or restarts containers based on handlers.
 - **Template-ready Service Files:** Predefined service base and health check templates.
-- **Integration Support:** Compatible with `nginx-docker-reverse-proxy` and other CyMaIS service roles.
+- **Integration Support:** Compatible with `webserver-proxy-core` and other CyMaIS service roles.
 
 ## Administration Tips
 

roles/docker-compose/meta/main.yml

@@ -25,5 +25,5 @@ galaxy_info:
   issue_tracker_url: https://s.veen.world/cymaisissues
   documentation: https://s.veen.world/cymais
 dependencies:
-  - nginx-docker-reverse-proxy
+  - webserver-proxy-core
   - docker-container # Necessary for template use

roles/docker-compose/tasks/files.yml

@@ -3,8 +3,8 @@
     src: "{{ item }}"
     dest: "{{ docker_compose.files.dockerfile }}"
   loop:
-    - "{{ playbook_dir }}/roles/docker-{{ application_id }}/templates/Dockerfile.j2"
-    - "{{ playbook_dir }}/roles/docker-{{ application_id }}/files/Dockerfile"
+    - "{{ playbook_dir }}/roles/web-app-{{ application_id }}/templates/Dockerfile.j2"
+    - "{{ playbook_dir }}/roles/web-app-{{ application_id }}/files/Dockerfile"
   notify: docker compose up
   register: create_dockerfile_result
   failed_when:
@@ -20,8 +20,8 @@
   notify:         docker compose up
   register:       env_template
   loop:
-    - "{{ playbook_dir }}/roles/docker-{{ application_id }}/templates/env.j2"
-    - "{{ playbook_dir }}/roles/docker-{{ application_id }}/files/env"
+    - "{{ playbook_dir }}/roles/web-app-{{ application_id }}/templates/env.j2"
+    - "{{ playbook_dir }}/roles/web-app-{{ application_id }}/files/env"
   failed_when:
     - env_template is failed
     - "'Could not find or access' not in env_template.msg"

roles/docker-compose/templates/base.yml.j2

@@ -2,14 +2,14 @@
 services:
 {# Load Database #}
 {% if applications[application_id].docker.services.database.enabled | default(false) | bool %}
-{% include 'roles/docker-central-database/templates/services/main.yml.j2' %}
+{% include 'roles/service-rdbms-central/templates/services/main.yml.j2' %}
 {% endif %}
 {# Load Redis #}
 {% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
-{% include 'roles/docker-redis/templates/service.yml.j2' %}
+{% include 'roles/web-app-redis/templates/service.yml.j2' %}
 {% endif %}
 {# Load OAuth2 Proxy #}
 {% if applications | is_feature_enabled('oauth2',application_id) %}
-{% include 'roles/docker-oauth2-proxy/templates/container.yml.j2' %}
+{% include 'roles/web-app-oauth2-proxy/templates/container.yml.j2' %}
 {% endif %}
 {{ "\n" }}