Refactor: consolidate pkgmgr updates and remove legacy roles

Details:
- Added pkgmgr update task directly in pkgmgr role (pkgmgr pull --all)
- Removed deprecated update-pkgmgr role and references
- Removed deprecated update-pip role and references
- Simplified update-compose by dropping update-pkgmgr include

https://chatgpt.com/share/68bbeff1-27a0-800f-bef3-03ab597595fd

docs/guides/administrator/README.md

@@ -15,7 +15,7 @@ Follow these guides to install and configure Infinito.Nexus:
 - **Networking & VPN** - Configure `WireGuard`, `OpenVPN`, and `Nginx Reverse Proxy`.
 
 ## Managing & Updating Infinito.Nexus 🔄
-- Regularly update services using `update-docker`, `update-pacman`, or `update-apt`.
+- Regularly update services using `update-pacman`, or `update-apt`.
 - Monitor system health with `sys-ctl-hlth-btrfs`, `sys-ctl-hlth-webserver`, and `sys-ctl-hlth-docker-container`.
 - Automate system maintenance with `sys-lock`, `sys-ctl-cln-bkps`, and `sys-ctl-rpr-docker-hard`.
 

filter_plugins/volume_path.py

@@ -0,0 +1,21 @@
+from ansible.errors import AnsibleFilterError
+
+def docker_volume_path(volume_name: str) -> str:
+    """
+    Returns the absolute filesystem path of a Docker volume.
+
+    Example:
+        "akaunting_data" -> "/var/lib/docker/volumes/akaunting_data/_data/"
+    """
+    if not volume_name or not isinstance(volume_name, str):
+        raise AnsibleFilterError(f"Invalid volume name: {volume_name}")
+
+    return f"/var/lib/docker/volumes/{volume_name}/_data/"
+
+class FilterModule(object):
+    """Docker volume path filters."""
+
+    def filters(self):
+        return {
+            "docker_volume_path": docker_volume_path,
+        }

group_vars/all/07_services.yml

@@ -12,7 +12,6 @@ SYS_SERVICE_BACKUP_RMT_2_LOC:           "{{ 'svc-bkp-rmt-2-loc'         | get_se
 SYS_SERVICE_BACKUP_DOCKER_2_LOC:        "{{ 'sys-ctl-bkp-docker-2-loc'  | get_service_name(SOFTWARE_NAME) }}"
 SYS_SERVICE_REPAIR_DOCKER_SOFT:         "{{ 'sys-ctl-rpr-docker-soft'   | get_service_name(SOFTWARE_NAME) }}"
 SYS_SERVICE_REPAIR_DOCKER_HARD:         "{{ 'sys-ctl-rpr-docker-hard'   | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_UPDATE_DOCKER:              "{{ 'update-docker'             | get_service_name(SOFTWARE_NAME) }}"
 
 ## On Failure
 SYS_SERVICE_ON_FAILURE_COMPOSE:         "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
@@ -46,8 +45,7 @@ SYS_SERVICE_GROUP_MANIPULATION: >
       SYS_SERVICE_GROUP_CLEANUP +
       SYS_SERVICE_GROUP_REPAIR +
       SYS_SERVICE_GROUP_OPTIMIZATION +
-      SYS_SERVICE_GROUP_MAINTANANCE +
+      SYS_SERVICE_GROUP_MAINTANANCE
-      [ SYS_SERVICE_UPDATE_DOCKER ]
     ) | sort
   }}
 

roles/pkgmgr/tasks/01_core.yml

@@ -43,3 +43,7 @@
     chdir: "{{ PKGMGR_INSTALL_PATH }}"
     executable: /bin/bash
   become: true
+
+- name: "Update all repositories with pkgmgr"
+  command: "pkgmgr pull --all"
+  when: MODE_UPDATE | bool

roles/sys-svc-rdbms/tasks/main.yml

@@ -8,10 +8,10 @@
       path: "{{ docker_compose.directories.env }}"
       state: directory
       mode: "0755"
-  - name: "For '{{ application_id }}': Create {{database_env}}"
+  - name: "For '{{ application_id }}': Create {{ database_env }}"
     template: 
-      src: "env/{{database_type}}.env.j2"
+      src: "env/{{ database_type }}.env.j2"
-      dest: "{{database_env}}"
+      dest: "{{ database_env }}"
     notify: docker compose up
   when: not applications | get_app_conf(application_id, 'features.central_database', False)
 
@@ -19,7 +19,7 @@
   # I don't know why this includes leads to that the application_id in vars/main.yml of the database role isn't used
   # This is the behaviour which I want, but I'm still wondering why ;)
   include_role:
-    name: "svc-db-{{database_type}}"
+    name: "svc-db-{{ database_type }}"
   when: applications | get_app_conf(application_id, 'features.central_database', False)
 
 - name: "For '{{ application_id }}': Add Entry for Backup Procedure"

roles/sys-svc-rdbms/templates/services/mariadb.yml.j2

@@ -5,10 +5,10 @@
     container_name: {{ application_id | get_entity_name }}-database
     logging:
       driver: journald
-    image: mariadb
+    image: {{ database_image }}:{{ database_version }}
     restart: {{ DOCKER_RESTART_POLICY }}
     env_file:
-      - {{database_env}}
+      - {{ database_env }}
     command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW"
     volumes:
       - database:/var/lib/mysql

roles/sys-svc-rdbms/templates/services/postgres.yml.j2

@@ -2,13 +2,13 @@
 
 {% if not applications | get_app_conf(application_id, 'features.central_database', False) %}  
   {{ database_host }}:
-    image: postgres:{{ applications['svc-db-postgres'].version}}-alpine
+    image: {{ database_image }}:{{ database_version }}
     container_name: {{ application_id | get_entity_name }}-database
     env_file:
-      - {{database_env}}
+      - {{ database_env }}
     restart: {{ DOCKER_RESTART_POLICY }}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U {{ database_name }}"]
+      test: ["CMD-SHELL", "pg_isready -U {{ database_username }}"]
       interval: 10s
       timeout: 5s
       retries: 6

roles/sys-svc-rdbms/vars/database.yml

@@ -5,6 +5,7 @@ _database_central_name:           "{{ (applications | get_app_conf(_database_id,
 _database_consumer_id:              "{{ database_application_id | d(application_id) }}"
 _database_consumer_entity_name:     "{{ _database_consumer_id | get_entity_name }}"
 _database_central_enabled:          "{{ (applications | get_app_conf(_database_consumer_id, 'features.central_database', False)) if _dbtype else False }}"
+_database_default_version:          "{{ applications | get_app_conf(_database_id, 'docker.services.' ~ _dbtype ~ '.version') }}"
 
 # Definition
 
@@ -18,3 +19,5 @@ database_env:       "{{ docker_compose.directories.env }}{{ database_type }}.env
 database_url_jdbc:      "jdbc:{{ database_type if database_type == 'mariadb' else 'postgresql' }}://{{ database_host }}:{{ database_port }}/{{ database_name }}"
 database_url_full:      "{{ database_type }}://{{ database_username }}:{{ database_password }}@{{ database_host }}:{{ database_port }}/{{ database_name }}"
 database_volume:        "{{ _database_consumer_entity_name ~ '_' if not _database_central_enabled }}{{ database_host }}"
+database_image:         "{{ _dbtype }}"
+database_version:       "{{ applications | get_app_conf( _database_consumer_id, 'docker.services.database.version', False, _database_default_version) }}"

roles/update-compose/tasks/01_core.yml

@@ -14,13 +14,6 @@
     name: update-apt
   when: ansible_distribution == "Debian"
 
-- name: "Update Docker Images"
-  include_role:
-    name: update-docker
-  when:
-    - docker_compose_directory_stat.stat.exists
-    - run_once_update_docker is not defined
-
 - name: "Check if yay is installed"
   command: which yay
   register: yay_installed
@@ -51,7 +44,3 @@
   register: pkgmgr_available
   failed_when: false
 
-- name: "Update all repositories using pkgmgr"
-  include_role:
-    name: update-pkgmgr
-  when: pkgmgr_available.rc == 0

roles/update-docker/README.md

@@ -1,27 +0,0 @@
-# Update Docker
-
-## Description
-
-This role updates Docker Compose instances by checking for changes in Docker image digests and applying updates if necessary. It utilizes a Python script to handle git pulls and Docker image pulls, and rebuilds containers when changes are detected.
-
-## Overview
-
-The role performs the following:
-- Deploys a Python script to check for Docker image updates.
-- Configures a systemd service to run the update script.
-- Restarts the Docker update service upon configuration changes.
-- Supports additional procedures for specific Docker applications (e.g., Discourse, Mastodon, Nextcloud).
-
-## Purpose
-
-The role is designed to ensure that Docker images remain current by automatically detecting changes and rebuilding containers as needed. This helps maintain a secure and efficient container environment.
-
-## Features
-
-- **Docker Image Monitoring:** Checks for changes in image digests.
-- **Automated Updates:** Pulls new images and rebuilds containers when necessary.
-- **Service Management:** Configures and restarts a systemd service to handle updates.
-- **Application-Specific Procedures:** Includes hooks for updating specific Docker applications.
-
-## Credits 📝
-It was created with the help of ChatGPT. The conversation is available [here](https://chat.openai.com/share/165418b8-25fa-433b-baca-caded941e22a)

roles/update-docker/meta/main.yml

@@ -1,27 +0,0 @@
-galaxy_info:
-  author: "Kevin Veen-Birkenbach"
-  description: "Updates Docker Compose instances by detecting changes in Docker image digests and rebuilding containers when necessary. This role automates Docker image pulls and container rebuilds."
-  license: "Infinito.Nexus NonCommercial License"
-  license_url: "https://s.infinito.nexus/license"
-  company: |
-    Kevin Veen-Birkenbach
-    Consulting & Coaching Solutions
-    https://www.veen.world
-  min_ansible_version: "2.9"
-  platforms:
-  - name: Archlinux
-    versions:
-    - rolling
-  - name: Ubuntu
-    versions:
-    - all
-  galaxy_tags:
-  - docker
-  - update
-  - compose
-  - images
-  - systemd
-  - maintenance
-  repository: "https://s.infinito.nexus/code"
-  issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://docs.infinito.nexus"

roles/update-docker/tasks/01_core.yml

@@ -1,20 +0,0 @@
-- name: Include dependency 'sys-lock'
-  include_role:
-    name: sys-lock
-  when: run_once_sys_lock is not defined
-
-- name: "start {{ 'sys-ctl-bkp-docker-2-loc-everything' | get_service_name(SOFTWARE_NAME) }}"
-  systemd:
-    name: "{{ 'sys-ctl-bkp-docker-2-loc-everything' | get_service_name(SOFTWARE_NAME) }}"
-    state: started
-  when:
-  - MODE_BACKUP | bool
-
-- include_role:
-    name: sys-service
-  vars:
-    system_service_restarted:           true
-    system_service_timer_enabled:       false
-    system_service_tpl_on_failure:      "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
-    system_service_tpl_exec_start:      "{{ system_service_script_exec }} {{ PATH_DOCKER_COMPOSE_INSTANCES }}"
-    system_service_tpl_exec_start_pre:  "/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} {{ 'update-docker' | get_service_name(SOFTWARE_NAME) }} --timeout '{{ SYS_TIMEOUT_DOCKER_UPDATE }}'"

roles/update-docker/tasks/main.yml

@@ -1,4 +0,0 @@
-- block:
-    - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
-  when: run_once_update_docker is not defined

roles/update-docker/templates/script.py.j2

@@ -1,217 +0,0 @@
-import os
-import subprocess
-import sys
-import time
-
-def run_command(command):
-    """
-    Executes the specified shell command, streaming and collecting its output in real-time.
-    If the command exits with a non-zero status, a subprocess.CalledProcessError is raised,
-    including the exit code, the executed command, and the full output (as bytes) for debugging purposes.
-    """
-    process = None
-    try:
-        process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        output = []
-
-        for line in iter(process.stdout.readline, b''):
-            decoded_line = line.decode()
-            output.append(decoded_line)
-            sys.stdout.write(decoded_line)
-
-        return_code = process.wait()
-        if return_code:
-            full_output = ''.join(output)
-            raise subprocess.CalledProcessError(return_code, command, output=full_output.encode())
-    finally:
-        if process and process.stdout:
-            process.stdout.close()
-
-def git_pull():
-    """
-    Checks whether the Git repository in the specified directory is up to date and performs a git pull if necessary.
-    
-    Raises:
-        Exception: If retrieving the local or remote git revision fails because the command returns a non-zero exit code.
-    """
-    print("Checking if the git repository is up to date.")
-
-    # Run 'git rev-parse @' and check its exit code explicitly.
-    local_proc = subprocess.run("git rev-parse @", shell=True, capture_output=True)
-    if local_proc.returncode != 0:
-        error_msg = local_proc.stderr.decode().strip() or "Unknown error while retrieving local revision."
-        raise Exception(f"Failed to retrieve local git revision: {error_msg}")
-    local = local_proc.stdout.decode().strip()
-
-    # Run 'git rev-parse @{u}' and check its exit code explicitly.
-    remote_proc = subprocess.run("git rev-parse @{u}", shell=True, capture_output=True)
-    if remote_proc.returncode != 0:
-        error_msg = remote_proc.stderr.decode().strip() or "Unknown error while retrieving remote revision."
-        raise Exception(f"Failed to retrieve remote git revision: {error_msg}")
-    remote = remote_proc.stdout.decode().strip()
-
-    if local != remote:
-        print("Repository is not up to date. Performing git pull.")
-        run_command("git pull")
-        return True
-
-    print("Repository is already up to date.")
-    return False
-
-{% raw %}        
-def get_image_digests(directory):
-    """
-    Retrieves the image digests for all images in the specified Docker Compose project.
-    """
-    compose_project = os.path.basename(directory)
-    try:
-        images_output = subprocess.check_output(
-            f'docker images --format "{{{{.Repository}}}}:{{{{.Tag}}}}@{{{{.Digest}}}}" | grep {compose_project}', 
-            shell=True
-        ).decode().strip()
-        return dict(line.split('@') for line in images_output.splitlines() if line)
-    except subprocess.CalledProcessError as e:
-        if e.returncode == 1:  # grep no match found
-            return {}
-        else:
-            raise  # Other errors are still raised
-{% endraw %}
-
-def is_any_service_up():
-    """
-    Checks if any Docker services are currently running.
-    """
-    process = subprocess.Popen("docker-compose ps -q", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    output, _ = process.communicate()
-    service_ids = output.decode().strip().splitlines()
-    return bool(service_ids)
-
-def pull_docker_images():
-    """
-    Pulls the latest Docker images for the project.
-    """
-    print("Pulling docker images.")
-    try:
-        run_command("docker-compose pull")
-    except subprocess.CalledProcessError as e:
-        if "pull access denied" in e.output.decode() or "must be built from source" in e.output.decode():
-            print("Need to build the image from source.")
-            return True
-        else:
-            print("Failed to pull images with unexpected error.")
-            raise
-    return False
-
-def update_docker(directory):
-    """
-    Checks for updates to Docker images and rebuilds containers if necessary.
-    """
-    print(f"Checking for updates to Docker images in {directory}.")        
-    before_digests = get_image_digests(directory)
-    need_to_build = pull_docker_images()
-    after_digests = get_image_digests(directory)
-    if before_digests != after_digests:
-        print("Changes detected in image digests. Rebuilding containers.")
-        need_to_build = True
-        
-    if need_to_build:
-        # This propably just rebuilds the Dockerfile image if there is a change in the other docker compose containers
-        run_command("docker-compose build --pull")
-        start_docker(directory)
-    else:
-        print("Docker images are up to date. No rebuild necessary.")
-
-def update_discourse(directory):
-    """
-    Updates Discourse by running the rebuild command on the launcher script.
-    """
-    docker_repository_directory   = os.path.join(directory, "services", "{{ applications | get_app_conf('web-app-discourse','repository') }}")
-    print(f"Using path {docker_repository_directory } to pull discourse repository.")
-    os.chdir(docker_repository_directory )
-    if git_pull():
-        print("Start Discourse update procedure.")
-        update_procedure("docker stop {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
-        update_procedure("docker rm {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
-        try:
-            update_procedure("docker network connect {{ applications | get_app_conf('web-app-discourse','docker.network') }} {{ applications | get_app_conf('svc-db-postgres', 'docker.network') }}")
-        except subprocess.CalledProcessError as e:
-            error_message = e.output.decode()
-            if "already exists" in error_message or "is already connected" in error_message:
-                print("Network connection already exists. Skipping...")
-            else:
-                raise
-        update_procedure("./launcher rebuild {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
-    else:
-        print("Discourse update skipped. No changes in git repository.")
-
-def upgrade_listmonk():
-    """
-    Runs the upgrade for Listmonk
-    """
-    print("Starting Listmonk upgrade.")
-    run_command('echo "y" | docker compose run -T application ./listmonk --upgrade')
-    print("Upgrade complete.")
-
-def update_procedure(command):
-    """
-    Attempts to execute a command up to a maximum number of retries.
-    """
-    max_attempts = 3
-    for attempt in range(max_attempts):
-        try:
-            run_command(command)
-            break  # If the command succeeds, exit the loop
-        except subprocess.CalledProcessError as e:
-            if attempt < max_attempts - 1:  # Check if it's not the last attempt
-                print(f"Attempt {attempt + 1} failed, retrying in 60 seconds...")
-                time.sleep(60)  # Wait for 60 seconds before retrying
-            else:
-                print("All attempts to update have failed.")
-                raise  # Re-raise the last exception after all attempts fail
-
-def start_docker(directory):
-    """
-    Starts or restarts Docker services in the specified directory.
-    """
-    if is_any_service_up():
-        print(f"Restarting containers in {directory}.")
-        run_command("docker-compose up -d --force-recreate")
-    else:
-        print(f"Skipped starting. No service is up in {directory}.")
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("Please provide the path to the parent directory as a parameter.")
-        sys.exit(1)
-
-    parent_directory = sys.argv[1]
-    for dir_entry in os.scandir(parent_directory):
-        if dir_entry.is_dir():
-            dir_path = dir_entry.path
-            print(f"Checking for updates in: {dir_path}")
-            os.chdir(dir_path)
-            
-            # Pull git repository if it exist
-            # @deprecated: This function should be removed in the future, as soon as all docker applications use the correct folder path
-            if os.path.isdir(os.path.join(dir_path, ".git")):
-                print("DEPRECATED: Docker .git repositories should be saved under /opt/docker/{instance}/services/{repository_name} ")
-                git_pull()
-            
-            if os.path.basename(dir_path) == "matrix":
-                # No autoupdate for matrix is possible atm, 
-                # due to the reason that the role has to be executed every time.
-                # The update has to be executed in the role
-                # @todo implement in future
-                pass
-            else:
-                # Pull and update docker images
-                update_docker(dir_path)
-                
-                # The following instances need additional update and upgrade procedures
-                if os.path.basename(dir_path) == "discourse":
-                    update_discourse(dir_path)
-                elif os.path.basename(dir_path) == "listmonk":
-                    upgrade_listmonk()
-                    
-                # @todo implement dedicated procedure for bluesky
-                # @todo implement dedicated procedure for taiga

roles/update-docker/vars/main.yml

@@ -1,2 +0,0 @@
-application_id: update-docker
-system_service_id: "{{ application_id }}"

roles/update-pip/README.md

@@ -1,23 +0,0 @@
-# Update Pip Packages
-
-## Description
-
-This Ansible role automatically updates all installed Python Pip packages to their latest versions.
-
-## Overview
-
-The role performs the following:
-- Executes a command to retrieve all installed Python Pip packages.
-- Updates each package individually to its latest available version.
-- Ensures a smooth and automated Python environment maintenance process.
-
-## Purpose
-
-Ensures Python packages remain up-to-date, improving security and functionality.
-
-## Features
-
-- **Automatic Updates:** Automates the process of upgrading Python packages.
-- **Platform Independent:** Works on Linux, macOS, and Windows environments.
-- **Ansible Integration:** Easy to include in larger playbooks or maintenance routines.
-

roles/update-pip/meta/main.yml

@@ -1,25 +0,0 @@
-galaxy_info:
-  author: "Kevin Veen-Birkenbach"
-  license: "Infinito.Nexus NonCommercial License"
-  license_url: "https://s.infinito.nexus/license"
-  company: |
-    Kevin Veen-Birkenbach
-    Consulting & Coaching Solutions
-    https://www.veen.world
-  description: "Automatically updates all Python Pip packages to their latest available versions."
-  min_ansible_version: "2.9"
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Archlinux
-    versions:
-    - rolling
-  - name: Debian
-    versions:
-    - all
-  galaxy_tags:
-  - python
-  - pip
-  - update
-  - maintenance

roles/update-pip/tasks/main.yml

@@ -1,9 +0,0 @@
-- block:
-  - name: Include dependency 'dev-python-pip'
-    include_role:
-      name: dev-python-pip
-    when: run_once_dev_python_pip is not defined
-  - include_tasks: utils/run_once.yml
-    vars:
-      flush_handlers: false
-  when: run_once_update_pip is not defined

roles/update-pip/vars/main.yml

@@ -1 +0,0 @@
-application_id: update-pip

roles/update-pkgmgr/README.md

@@ -1,27 +0,0 @@
-# Update pkgmgr
-
-## Description
-
-This role checks if the [package manager](https://github.com/kevinveenbirkenbach/package-manager) is available on the system. If so, it runs `pkgmgr update --all` to update all repositories managed by the `pkgmgr`.
-
-## Overview
-
-This role performs the following tasks:
-- Checks if the `pkgmgr` command is available.
-- If available, runs `pkgmgr update --all` to update all repositories.
-
-## Purpose
-
-The purpose of this role is to simplify system updates by using the `pkgmgr` package manager to handle all repository updates with a single command.
-
-## Features
-
-- **Conditional Execution**: Runs only if the `pkgmgr` command is found on the system.
-- **Automated Updates**: Automatically runs `pkgmgr update --all` to update all repositories.
-
-## License
-
-Infinito.Nexus NonCommercial License  
-[Learn More](https://s.infinito.nexus/license)
-
-

roles/update-pkgmgr/TODO.md

@@ -1,2 +0,0 @@
-# Todos
-- Activate update again. Atm not possible, because it pulls all repos

roles/update-pkgmgr/meta/main.yml

@@ -1,24 +0,0 @@
----
-galaxy_info:
-  author: "Kevin Veen-Birkenbach"
-  description: "Checks if the pkgmgr command is available and runs 'pkgmgr update --all' to update all repositories."
-  license: "Infinito.Nexus NonCommercial License"
-  license_url: "https://s.infinito.nexus/license"
-  company: |
-    Kevin Veen-Birkenbach
-    Consulting & Coaching Solutions
-    https://www.veen.world
-  min_ansible_version: "2.9"
-  platforms:
-    - name: Linux
-      versions:
-        - all
-  galaxy_tags:
-    - update
-    - pkgmgr
-    - pkgmgr
-    - system
-  repository: "https://s.infinito.nexus/code"
-  issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://docs.infinito.nexus"
-dependencies: []

roles/update-pkgmgr/tasks/main.yml

@@ -1,3 +0,0 @@
-# run_once_update_pkgmgr: deactivated
-#- name: "Update all repositories with pkgmgr"
-#  command: "pkgmgr update --all"

roles/update-pkgmgr/vars/main.yml

@@ -1 +0,0 @@
-application_id: update-pkgmgr

roles/web-app-akaunting/vars/main.yml

@@ -23,6 +23,6 @@ AKAUNTING_COMPANY_NAME:             "{{ applications | get_app_conf(application_
 AKAUNTING_COMPANY_EMAIL:            "{{ applications | get_app_conf(application_id, 'company.email') }}"
 AKAUNTING_ADMIN_EMAIL:              "{{ applications | get_app_conf(application_id, 'setup_admin_email') }}"
 AKAUNTING_ADMIN_PASSWORD:           "{{ applications | get_app_conf(application_id, 'credentials.setup_admin_password') }}"
-AKAUNTING_SETUP_MARKER:             "/var/lib/docker/volumes/{{ AKAUNTING_VOLUME }}/_data/.akaunting_installed"
+AKAUNTING_SETUP_MARKER:             "{{ [ (AKAUNTING_VOLUME | docker_volume_path), '.akaunting_installed' ] | path_join }}"
 AKAUNTING_APP_KEY:                  "{{ applications | get_app_conf(application_id, 'credentials.app_key') }}"
 AKAUNTING_CACHE_DRIVER:             "{{ 'redis' if applications | get_app_conf(application_id, 'docker.services.redis.enabled') else 'file' }}"

roles/web-app-bluesky/config/main.yml

@@ -23,6 +23,7 @@ server:
         - https://statsigapi.net
         - https://ip.bsky.app
         - https://video.bsky.app
+        - https://bsky.app
         - wss://bsky.network
         - wss://*.bsky.app
       media-src:

roles/web-app-bluesky/tasks/02_social_app.yml

@@ -13,6 +13,9 @@
     path: "{{ BLUESKY_SOCIAL_APP_DIR }}/src/state/geolocation.tsx"
     regexp: '^\s*const\s+BAPP_CONFIG_URL\s*=\s*.*$'
     replace: "const BAPP_CONFIG_URL = '/config'"
-  notify:
+
-    - docker compose build
+- name: Force IPCC_URL to same-origin /ipcc
-    - docker compose up
+  ansible.builtin.replace:
+    path: "{{ BLUESKY_SOCIAL_APP_DIR }}/src/state/geolocation.tsx"
+    regexp: '^\s*const\s+IPCC_URL\s*=\s*.*$'
+    replace: "const IPCC_URL = '/ipcc'"

roles/web-app-bluesky/templates/extra_locations.conf.j2

@@ -14,3 +14,16 @@ location = /config {
     add_header Access-Control-Allow-Origin $scheme://$host always;
     add_header Vary Origin always;
 }
+
+location = /ipcc {
+    proxy_pass https://bsky.app/ipcc;
+    set $up_host "bsky.app";
+    proxy_set_header Host $up_host;
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_ssl_server_name on;
+
+    proxy_hide_header Access-Control-Allow-Origin;
+    add_header Access-Control-Allow-Origin $scheme://$host always;
+    add_header Vary Origin always;
+}

roles/web-app-bridgy-fed/README.md

@@ -9,7 +9,7 @@ This role builds and runs Bridgy Fed as a Docker container and (optionally) star
 Upstream docs & dev notes:
 - User & developer docs: https://fed.brid.gy and https://bridgy-fed.readthedocs.io/
 - Source: https://github.com/snarfed/bridgy-fed
-- Local run (reference): `flask run -p 8080` with APPVIEW_HOST/PLC_HOST/BGS_HOST/PDS_HOST set, and Datastore emulator envs
+- Local run (reference): `flask run -p 8080` with BRIDGY_APPVIEW_HOST/BRIDGY_PLC_HOST/BRIDGY_BGS_HOST/BRIDGY_PDS_HOST set, and Datastore emulator envs
 
 ## Features
 - Dockerized Flask app (gunicorn)

roles/web-app-bridgy-fed/config/main.yml

@@ -18,17 +18,12 @@ docker:
   services:
     database:
       enabled:    false
-    emulator:
-      enabled: true
-      image:    'gcr.io/google.com/cloudsdktool/google-cloud-cli:latest'
     application:
       image:      "python"
       version:    "3.12-bookworm"
       name:       "web-app-bridgy-fed"
-
+      repository: "https://github.com/snarfed/bridgy-fed.git"
+      branch:     "main"
 rbac:
   roles: {}
  
-source:
-  repo: "https://github.com/snarfed/bridgy-fed.git"
-  ref:  "main"

roles/web-app-bridgy-fed/files/Dockerfile

@@ -3,7 +3,7 @@ ARG PY_BASE="python:3.12-bookworm"
 FROM ${PY_BASE} AS build
 
 ARG BRIDGY_REPO_URL
-ARG BRIDGY_REPO_REF
+ARG BRIDGY_REPO_BRANCH
 
 # System deps: git, build tools, curl for healthchecks, and gunicorn
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
-RUN git clone --depth=1 --branch "${BRIDGY_REPO_REF}" "${BRIDGY_REPO_URL}" ./
+RUN git clone --depth=1 --branch "${BRIDGY_REPO_BRANCH}" "${BRIDGY_REPO_URL}" ./
 
 # Python deps
 RUN pip install --upgrade pip && \
@@ -35,7 +35,7 @@ PY
 FROM ${PY_BASE}
 
 ARG CONTAINER_PORT
-ENV PORT=${CONTAINER_PORT:-8080}
+ENV PORT=${CONTAINER_PORT}
 
 WORKDIR /app
 COPY --from=build /app /app

roles/web-app-bridgy-fed/tasks/01_core.yml

@@ -2,20 +2,8 @@
   include_role:
     name: sys-stk-full-stateless
 
-- name: "Include front proxy for {{ container_hostname }}:{{ ports.localhost.http[application_id] }}"
+- name: "Include front proxy for {{ container_hostname}}:{{ ports.localhost.http[application_id] }}"
   include_role:
     name: sys-stk-front-proxy
-  vars:
-    domain:    "{{ container_hostname }}"
-    http_port: "{{ ports.localhost.http[application_id] }}"
 
-- name: "Provide Dockerfile"
+- include_tasks: utils/run_once.yml
-  copy:
-    src: "Dockerfile"
-    dest: "{{ docker_compose.directories.instance }}/Dockerfile"
-  notify:
-    - docker compose build
-
-- name: "Run once marker"
-  set_fact:
-    run_once_web_app_bridgy_fed: true

roles/web-app-bridgy-fed/templates/Administration.md.j2

@@ -1,20 +0,0 @@
-# Administration
-
-## Local dev shell (inside container)
-```bash
-docker compose exec application bash
-```
-
-## Logs
-```bash
-docker compose logs -f application
-docker compose logs -f emulator   # if enabled
-```
-
-## Notes
-- Upstream dev run example:
-  ```bash
-  export APPVIEW_HOST=api.bsky.app PLC_HOST=plc.directory BGS_HOST=bsky.network PDS_HOST=atproto.brid.gy
-  flask --debug run -p 8080
-  ```
-  (We run via gunicorn in this role.)

roles/web-app-bridgy-fed/templates/docker-compose.yml.j2

@@ -6,38 +6,15 @@
       dockerfile: Dockerfile
       args:
         BRIDGY_REPO_URL: "{{ BRIDGY_REPO_URL }}"
-        BRIDGY_REPO_REF: "{{ BRIDGY_REPO_REF }}"
+        BRIDGY_REPO_BRANCH: "{{ BRIDGY_REPO_BRANCH }}"
         CONTAINER_PORT:  "{{ container_port | string }}"
-    image: "{{ BRIDGY_IMAGE }}"
+    image: "{{ BRIDGY_IMAGE }}:{{ BRIDGY_VERSION }}"
     container_name: "{{ BRIDGY_CONTAINER }}"
     hostname: "{{ container_hostname }}"
-    env_file:
-      - "{{ docker_compose.files.env }}"
     ports:
-      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
+      - "127.0.0.1:{{ http_port }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    depends_on:
-{% if EMULATOR_ENABLED | bool %}
-      - emulator
-{% endif %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 
-{% if EMULATOR_ENABLED | bool %}
-  emulator:
-    image: "{{ EMULATOR_IMAGE }}"
-    container_name: "{{ BRIDGY_CONTAINER }}_emulator"
-    command: >
-      gcloud emulators firestore start
-      --host-port=0.0.0.0:{{ EMULATOR_PORT }}
-      --database-mode=datastore-mode
-      --quiet
-    ports:
-      - "127.0.0.1:{{ EMULATOR_PORT }}:{{ EMULATOR_PORT }}"
-    environment:
-      - CLOUDSDK_CORE_DISABLE_PROMPTS=1
-    restart: unless-stopped
-{% include 'roles/docker-container/templates/networks.yml.j2' %}
-{% endif %}
-
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}

roles/web-app-bridgy-fed/templates/env.j2

@@ -1,18 +1,13 @@
 # Flask / Gunicorn basics
-FLASK_ENV="{{ ENVIRONMENT | default('production') }}"
+FLASK_ENV="{{ ENVIRONMENT }}"
 PORT="{{ container_port }}"
 BRIDGY_ADMIN_EMAIL="{{ BRIDGY_ADMIN_EMAIL }}"
 
 # Bridgy Fed upstream knobs (see README @ GitHub)
-APPVIEW_HOST="{{ APPVIEW_HOST }}"
+BRIDGY_APPVIEW_HOST="{{ BRIDGY_APPVIEW_HOST }}"
-PLC_HOST="{{ PLC_HOST }}"
+BRIDGY_PLC_HOST="{{ BRIDGY_PLC_HOST }}"
-BGS_HOST="{{ BGS_HOST }}"
+BRIDGY_BGS_HOST="{{ BRIDGY_BGS_HOST }}"
-PDS_HOST="{{ PDS_HOST }}"
+BRIDGY_PDS_HOST="{{ BRIDGY_PDS_HOST }}"
-
-# Datastore emulator (Datastore-mode Firestore). If sidecar enabled, point here.
-GOOGLE_CLOUD_PROJECT="{{ EMULATOR_PROJECT_ID }}"
-DATASTORE_EMULATOR_HOST="{{ EMULATOR_ENABLED | ternary(EMULATOR_HOST_INTERNAL, '') }}"
-# DATASTORE_DATASET not needed when GOOGLE_CLOUD_PROJECT is set
 
 # Optional:
 # GUNICORN_CMD_ARGS="--log-level info"

roles/web-app-bridgy-fed/vars/main.yml

@@ -1,27 +1,25 @@
 # General
 application_id:       "web-app-bridgy-fed"
 
+# Container
+container_port:       8080
+domain:               "{{ container_hostname }}"
+http_port:            "{{ ports.localhost.http[application_id] }}"
+container_hostname:   "{{ domains | get_domain(application_id) }}"
+
 # App container
 BRIDGY_CONTAINER:     "{{ applications | get_app_conf(application_id, 'docker.services.application.name') }}"
 BRIDGY_IMAGE:         "{{ applications | get_app_conf(application_id, 'docker.services.application.image') }}"
-#BRIDGY_VERSION:                       "{{ applications | get_app_conf(application_id, 'docker.services.application.version')}}"
+BRIDGY_VERSION:       "{{ applications | get_app_conf(application_id, 'docker.services.application.version')}}"
-container_port:                       8080
+
-container_hostname:                   "{{ domains | get_domain(application_id) }}"
 BRIDGY_ADMIN_EMAIL:   "{{ users.administrator.email }}"
 
 # Source
-BRIDGY_REPO_URL:                      "{{ applications | get_app_conf(application_id, 'source.repo') }}"
+BRIDGY_REPO_URL:      "{{ applications | get_app_conf(application_id, 'docker.services.application.repository') }}"
-BRIDGY_REPO_REF:                      "{{ applications | get_app_conf(application_id, 'source.ref') }}"
+BRIDGY_REPO_BRANCH:   "{{ applications | get_app_conf(application_id, 'docker.services.application.branch') }}"
-
-# Emulator sidecar (Datastore-mode Firestore)
-EMULATOR_ENABLED:                     "{{ applications | get_app_conf(application_id, 'docker.services.emulator.enabled') }}"
-EMULATOR_IMAGE:                       "{{ applications | get_app_conf(application_id, 'docker.services.emulator.image') }}"
-EMULATOR_PORT:                        8089
-EMULATOR_HOST_INTERNAL:               "emulator:8089"
-EMULATOR_PROJECT_ID:                  "bridgy-federated-local"
 
 # Runtime env defaults for Bridgy Fed (see upstream README)
-APPVIEW_HOST:                         "api.bsky.app"
+BRIDGY_APPVIEW_HOST:  "api.bsky.app"
-PLC_HOST:                             "plc.directory"
+BRIDGY_PLC_HOST:      "plc.directory"
-BGS_HOST:                             "bsky.network"
+BRIDGY_BGS_HOST:      "bsky.network"
-PDS_HOST:                             "atproto.brid.gy"
+BRIDGY_PDS_HOST:      "atproto.brid.gy"

roles/web-app-keycloak/tasks/main.yml

@@ -77,23 +77,16 @@
         }}
   include_tasks: _update.yml
 
-- name: "Update REALM mail settings"
+- name: "Update REALM mail settings from realm dictionary (SPOT)"
   include_tasks: _update.yml
   vars:
     kc_object_kind:  "realm"
     kc_lookup_field: "id"
     kc_lookup_value: "{{ KEYCLOAK_REALM }}"
     kc_desired:
-      smtpServer:
+      smtpServer: "{{ KEYCLOAK_DICTIONARY_REALM.smtpServer | default({}, true) }}"
-        from: "no-reply@{{ DEFAULT_SYSTEM_EMAIL.DOMAIN }}"
+    kc_merge_path:  "smtpServer"
-        fromDisplayName: "{{ SOFTWARE_NAME | default('Infinito.Nexus') }}"
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
-        host: "{{ DEFAULT_SYSTEM_EMAIL.HOST }}"
-        port: "{{ DEFAULT_SYSTEM_EMAIL.PORT }}"
-        # Keycloak expects strings "true"/"false"
-        ssl: "{{ 'true' if not DEFAULT_SYSTEM_EMAIL.START_TLS and DEFAULT_SYSTEM_EMAIL.TLS else 'false' }}"
-        starttls: "{{ 'true' if DEFAULT_SYSTEM_EMAIL.START_TLS else 'false' }}"
-        user: "{{ DEFAULT_SYSTEM_EMAIL.USER | default('') }}"
-        password: "{{ DEFAULT_SYSTEM_EMAIL.PASSWORD | default('') }}"
 
 - include_tasks: 05_rbac_client_scope.yml
 

roles/web-app-keycloak/templates/import/realm.json.j2

@@ -1443,20 +1443,7 @@
     "xXSSProtection": "1; mode=block",
     "strictTransportSecurity": "max-age=31536000; includeSubDomains"
   },
-  "smtpServer": {
+  {%- include "smtp_server.json.j2" -%},
-    "password": "{{ users['no-reply'].mailu_token }}",
-    "replyToDisplayName": "",
-    "starttls": "{{ SYSTEM_EMAIL.START_TLS | lower }}",
-    "auth": "true",
-    "port": "{{ SYSTEM_EMAIL.PORT }}",
-    "replyTo": "",
-    "host": "{{ SYSTEM_EMAIL.HOST }}",
-    "from": "{{ users['no-reply'].email }}",
-    "fromDisplayName": "Keycloak Authentification System - {{ KEYCLOAK_DOMAIN | upper }}",
-    "envelopeFrom": "",
-    "ssl": "true",
-    "user": "{{ users['no-reply'].email }}"
-  },
   "eventsEnabled": false,
   "eventsListeners": [
     "jboss-logging"

roles/web-app-keycloak/templates/import/smtp_server.json.j2

@@ -0,0 +1,14 @@
+"smtpServer": {
+    "password": "{{ users['no-reply'].mailu_token }}",
+    "replyToDisplayName": "",
+    "starttls": "{{ SYSTEM_EMAIL.START_TLS | lower }}",
+    "auth": "true",
+    "port": "{{ SYSTEM_EMAIL.PORT }}",
+    "replyTo": "",
+    "host": "{{ SYSTEM_EMAIL.HOST }}",
+    "from": "{{ users['no-reply'].email }}",
+    "fromDisplayName": "Keycloak Authentication System - {{ KEYCLOAK_DOMAIN | upper }}",
+    "envelopeFrom": "",
+    "ssl": "{{ (SYSTEM_EMAIL.TLS and not SYSTEM_EMAIL.START_TLS) | ternary('true','false') }}",
+    "user": "{{ users['no-reply'].email }}"
+}

roles/web-app-listmonk/tasks/main.yml

@@ -30,6 +30,14 @@
     chdir: "{{ docker_compose.directories.instance }}"
   when: "'No relations found.' in db_tables.stdout"
 
+- name: "Listmonk | run DB/schema upgrade (non-interactive)"
+  ansible.builtin.shell: |
+    set -o pipefail
+    echo "y" | docker compose run -T application ./listmonk --upgrade
+  args:
+    chdir: "{{ docker_compose.directories.instance }}"
+  when: MODE_UPDATE | bool
+
 - name: Build OIDC settings JSON
   set_fact:
     oidc_settings_json: >-
@@ -73,3 +81,4 @@
   no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
   async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
   poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
+

roles/web-app-magento/Administration.md

@@ -1,55 +0,0 @@
-# Administration
-
-## 🗑️ Cleanup (Remove Instance & Volumes)
-```bash
-cd {{ PATH_DOCKER_COMPOSE_INSTANCES }}magento/
-docker compose down
-docker volume rm MAGENTO_VOLUME
-cd {{ PATH_DOCKER_COMPOSE_INSTANCES }} && rm -vR {{ PATH_DOCKER_COMPOSE_INSTANCES }}magento
-```
-
-## 🔍 Access Container Shell
-```bash
-docker compose exec -it application /bin/bash
-```
-
-## 🧰 Common Magento CLI Tasks
-```bash
-# Reindex
-docker compose exec -it application bin/magento indexer:reindex
-
-# Flush caches
-docker compose exec -it application bin/magento cache:flush
-
-# Enable maintenance mode
-docker compose exec -it application bin/magento maintenance:enable
-
-# Disable maintenance mode
-docker compose exec -it application bin/magento maintenance:disable
-
-# Recompile DI (when switching modes)
-docker compose exec -it application bin/magento setup:di:compile
-
-# Deploy static content (example for English/German)
-docker compose exec -it application bin/magento setup:static-content:deploy en_US de_DE -f
-```
-
-## 🚀 Performance
-```bash
-# Production mode
-docker compose exec -it application bin/magento deploy:mode:set production
-
-# Developer mode
-docker compose exec -it application bin/magento deploy:mode:set developer
-```
-
-## 🔐 Admin User
-```bash
-# Create another admin (example)
-docker compose exec -it application bin/magento admin:user:create \
-  --admin-user="admin2" \
-  --admin-password="ChangeMe_12345" \
-  --admin-email="{{ users.administrator.email }}" \
-  --admin-firstname="Admin" \
-  --admin-lastname="User"
-```

roles/web-app-magento/TODO.md

@@ -0,0 +1,2 @@
+# To-dos
+- Finish implementation

roles/web-app-magento/Upgrade.md

@@ -1,19 +0,0 @@
-# 🔼 Upgrade
-
-> Always back up the database and the `MAGENTO_VOLUME` volume before upgrades.
-
-1. Update images/versions in the application config (`roles/web-app-magento/config/main.yml` or inventory overrides).
-2. Recreate containers:
-   ```bash
-   cd {{ PATH_DOCKER_COMPOSE_INSTANCES }}magento/
-   docker compose pull
-   docker compose up -d --remove-orphans
-   ```
-3. Run upgrade routines:
-   ```bash
-   docker compose exec -it application bin/magento maintenance:enable
-   docker compose exec -it application bin/magento setup:upgrade
-   docker compose exec -it application bin/magento setup:di:compile
-   docker compose exec -it application bin/magento cache:flush
-   docker compose exec -it application bin/magento maintenance:disable
-   ```

roles/web-app-magento/config/main.yml

@@ -2,7 +2,7 @@ features:
   matomo:             true
   css:                true
   desktop:            true
-  central_database:   true        # Use platform DB (recommended). If false, app-local DB container is enabled.
+  central_database:   false       # Impossible to use central database due to strict database checking
   oidc:               false       # Magento SSO via OIDC requires extensions; not wired by default
   logout:             true
   ldap:               false
@@ -15,17 +15,23 @@ server:
       - "shop.{{ PRIMARY_DOMAIN }}"
     aliases:
       - "magento.{{ PRIMARY_DOMAIN }}"
-
 docker:
   services:
-    application:
+    php:
-      image:              "ghcr.io/alexcheng1982/docker-magento2"
+      image:              "markoshust/magento-php"
-      version:            "2.4.6-p3"
+      version:            "8.2-fpm"
-      name:               "magento"
+      name:               "magento-php"
+      backup:
+        no_stop_required: true
+    nginx:
+      image:              "markoshust/magento-nginx"
+      version:            "latest"
+      name:               "magento-nginx"
       backup:
         no_stop_required: true
     database:
-      enabled:            true      # Central DB recommended; if disabled, app-local DB is created
+      enabled:            true
+      version:            "11.4"
     redis:
       enabled:            true
     search:

roles/web-app-magento/schema/main.yml

@@ -1 +1,7 @@
-
+credentials:
+  adobe_public_key:
+      description: "Adobe/Magento Marketplace Public Key"
+      algorithm: "plain"
+  adobe_private_key:
+      description: "Adobe/Magento Marketplace Private Key"
+      algorithm: "plain"

roles/web-app-magento/tasks/01_core.yml

@@ -4,15 +4,34 @@
   vars:
     docker_compose_flush_handlers: true
 
+- name: "Bootstrap Magento 2.4.8 source (exact working variant)"
+  command: >
+    docker exec
+    -e COMPOSER_AUTH='{"http-basic":{"repo.magento.com":{"username":"{{ MAGENTO_REPO_PUBLIC_KEY }}","password":"{{ MAGENTO_REPO_PRIVATE_KEY }}"}}}'
+    -e COMPOSER_HOME=/tmp/composer
+    -e COMPOSER_CACHE_DIR=/tmp/composer/cache
+    --user {{ MAGENTO_USER }}
+    {{ MAGENTO_PHP_CONTAINER }} bash -lc 'set -e
+      mkdir -p /tmp/composer/cache
+      cd /var/www/html
+      composer create-project --no-interaction --no-progress --repository-url=https://repo.magento.com/ magento/project-community-edition=2.4.8 .
+      mkdir -p var pub/static pub/media app/etc
+      chmod -R 775 var pub/static pub/media app/etc
+    '
+  args:
+    creates: "{{ [ (MAGENTO_VOLUME | docker_volume_path), 'bin/magento' ] | path_join }}"
+
 - name: "Run Magento setup:install (in container)"
   command: >
-    docker compose exec -T application bash -lc "
+    docker exec --user {{ MAGENTO_USER }} {{ MAGENTO_PHP_CONTAINER }} bash -lc "
     cd /var/www/html && bin/magento setup:install \
       --base-url='{{ MAGENTO_URL }}/' \
       --db-host=\"$MYSQL_HOST\" \
       --db-name=\"$MYSQL_DATABASE\" \
       --db-user=\"$MYSQL_USER\" \
       --db-password=\"$MYSQL_PASSWORD\" \
+      --skip-db-validation \
+      --db-engine=mysql \
       --search-engine='opensearch' \
       --opensearch-host=\"$OPENSEARCH_HOST\" \
       --opensearch-port=\"$OPENSEARCH_PORT_NUMBER\" \
@@ -22,7 +41,7 @@
       --admin-user=\"$MAGENTO_ADMIN_USERNAME\" \
       --admin-password=\"$MAGENTO_ADMIN_PASSWORD\""
   args:
-    chdir: "{{ docker_compose.directories.instance }}"
+    creates: "{{ [ (MAGENTO_VOLUME | docker_volume_path), 'app/etc/env.php' ] | path_join }}"
   register: magento_install
   changed_when: >
     (magento_install.stdout is defined and

roles/web-app-magento/tasks/02_runtime_conf.yml

@@ -0,0 +1,35 @@
+---
+- name: Assert required vars (no defaults anywhere)
+  assert:
+    that:
+      - MAGENTO_DOMAIN is defined and MAGENTO_DOMAIN | length > 0
+      - MAGENTO_NGINX_PORT is defined
+      - MAGENTO_PHP_HOST is defined and MAGENTO_PHP_HOST | length > 0
+      - MAGENTO_PHP_PORT is defined
+      - docker_compose.directories.config is defined and docker_compose.directories.config | length > 0
+    fail_msg: "Missing one of: MAGENTO_DOMAIN, MAGENTO_NGINX_PORT, MAGENTO_PHP_HOST, MAGENTO_PHP_PORT, docker_compose.directories.config"
+
+- name: Ensure subdirs exist (config root exists already)
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: '0755'
+  loop:
+    - "{{ MAGENTO_NGINX_DIR }}"
+    - "{{ MAGENTO_PHP_DIR }}"
+
+- name: Render nginx main config (no TLS; single source of truth)
+  template:
+    src: "nginx.conf.j2"
+    dest: "{{ MAGENTO_NGINX_CONF_PATH }}"
+    mode: '0644'
+    force: true
+  notify: docker compose up
+
+- name: Render php-fpm pool override (TCP listen; clear_env=no)
+  template:
+    src: "php-fpm-zz-docker.conf.j2"
+    dest: "{{ MAGENTO_PHP_ZZ_CONF_PATH }}"
+    mode: '0644'
+    force: true
+  notify: docker compose up

roles/web-app-magento/templates/docker-compose.yml.j2

@@ -1,27 +1,44 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
-
+  nginx:
-  application:
+{% set container_port = 8000 %}
-{% set container_port = 80 %}
+    image: "{{ MAGENTO_NGINX_IMAGE }}:{{ MAGENTO_NGINX_VERSION }}"
-{% include 'roles/docker-container/templates/base.yml.j2' %}
+    container_name: "{{ MAGENTO_NGINX_CONTAINER }}"
-    image: "{{ MAGENTO_IMAGE }}:{{ MAGENTO_VERSION }}"
+    environment:
-    container_name: "{{ MAGENTO_CONTAINER }}"
+      PHP_HOST: "php"
-    ports:
+      PHP_PORT: "9000"
-      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
+    depends_on:
+      - php
+      - search
     volumes:
       - "data:/var/www/html"
-{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
+    ports:
-#      search:
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
-#        condition: service_healthy
+    healthcheck:
-{% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
+      test: ["CMD-SHELL", "nginx -t >/dev/null 2>&1 && { grep -q ':1F40' /proc/net/tcp || grep -q ':1F40' /proc/net/tcp6; }"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
+
+  php:
+{% include 'roles/docker-container/templates/base.yml.j2' %}
+    image: "{{ MAGENTO_PHP_IMAGE }}:{{ MAGENTO_PHP_VERSION }}"
+    container_name: "{{ MAGENTO_PHP_CONTAINER }}"
+    volumes:
+      - "data:/var/www/html"
+{% include 'roles/docker-container/templates/depends_on/dmbs_incl.yml.j2' %}
+      search:
+        condition: service_started
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 
   search:
 {% set container_port = 9200 %}
     image: "{{ MAGENTO_SEARCH_IMAGE }}:{{ MAGENTO_SEARCH_VERSION }}"
-    container_name: "{{ MAGENTO_SEARCH_NAME }}"
+    container_name: "{{ MAGENTO_SEARCH_CONTAINER }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     environment:
       - discovery.type=single-node
+      - plugins.security.disabled=true
       - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
@@ -31,3 +48,4 @@
     name: {{ MAGENTO_VOLUME }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
+

roles/web-app-magento/templates/nginx.conf.j2

@@ -0,0 +1,47 @@
+worker_processes auto;
+
+events { worker_connections 1024; }
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  sendfile on;
+  keepalive_timeout 65;
+
+  access_log /dev/stdout;
+  error_log  /dev/stderr;
+
+  upstream fastcgi_backend {
+    server {{ MAGENTO_PHP_HOST }}:{{ MAGENTO_PHP_PORT }};
+  }
+
+  server {
+    listen {{ MAGENTO_NGINX_PORT }};
+    server_name {{ MAGENTO_DOMAIN }};
+
+    set $MAGE_ROOT /var/www/html;
+    root $MAGE_ROOT/pub;
+    index index.php;
+
+    location / {
+      try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+      fastcgi_split_path_info ^(.+\.php)(/.+)$;
+      include fastcgi_params;
+      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+      fastcgi_param PATH_INFO       $fastcgi_path_info;
+      fastcgi_index index.php;
+      fastcgi_pass  fastcgi_backend;
+      fastcgi_read_timeout 300;
+      fastcgi_connect_timeout 5s;
+    }
+
+    location ~* ^/(app|var|lib|dev|update|vendor|node_modules|\.git|\.svn)/ { deny all; }
+    location ~ /\. { deny all; }
+
+    error_page 404 403 = /errors/404.php;
+  }
+}

roles/web-app-magento/templates/php-fpm-zz-docker.conf.j2

@@ -0,0 +1,15 @@
+[global]
+error_log = /proc/self/fd/2
+
+[www]
+listen = 0.0.0.0:{{ MAGENTO_PHP_PORT }}
+clear_env = no
+
+pm = dynamic
+pm.max_children = 10
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 5
+
+access.log = /proc/self/fd/2
+catch_workers_output = yes

roles/web-app-magento/vars/main.yml

@@ -3,14 +3,43 @@ application_id:                 "web-app-magento"
 database_type:                  "mariadb"
 
 # Magento (application container)
+
+## Meta
+MAGENTO_VOLUME:                 "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
+MAGENTO_USER:                   "app"
+
+## Address
 MAGENTO_DOMAIN:                 "{{ domains | get_domain(application_id) }}"
 MAGENTO_URL:                    "{{ domains | get_url(application_id, WEB_PROTOCOL) }}"
-MAGENTO_VERSION:                "{{ applications | get_app_conf(application_id, 'docker.services.application.version') }}"
-MAGENTO_IMAGE:                  "{{ applications | get_app_conf(application_id, 'docker.services.application.image') }}"
-MAGENTO_CONTAINER:              "{{ applications | get_app_conf(application_id, 'docker.services.application.name') }}"
-MAGENTO_VOLUME:                 "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
 
-# Search (OpenSearch)
+## Runtime config paths (used by 02_runtime_conf.yml)
+# Root config directory comes from the docker_compose subsystem (already asserted)
+MAGENTO_NGINX_DIR:              "{{ [ docker_compose.directories.config, 'nginx' ] | path_join }}"
+MAGENTO_PHP_DIR:                "{{ [ docker_compose.directories.config, 'php' ]   | path_join }}"
+MAGENTO_NGINX_CONF_PATH:        "{{ [ MAGENTO_NGINX_DIR, 'nginx.conf' ] | path_join }}"
+MAGENTO_PHP_ZZ_CONF_PATH:       "{{ [ MAGENTO_PHP_DIR, 'php-fpm-zz-docker.conf' ] | path_join }}"
+
+## Intra-container wiring (nginx -> php-fpm) and listen port
+# These values mirror the docker-compose template (environment variables and exposed port)
+MAGENTO_PHP_HOST:               "php"
+MAGENTO_PHP_PORT:               9000
+MAGENTO_NGINX_PORT:             8000
+
+## Search (OpenSearch)
 MAGENTO_SEARCH_VERSION:         "{{ applications | get_app_conf(application_id, 'docker.services.search.version') }}"
 MAGENTO_SEARCH_IMAGE:           "{{ applications | get_app_conf(application_id, 'docker.services.search.image') }}"
-MAGENTO_SEARCH_NAME:            "{{ applications | get_app_conf(application_id, 'docker.services.search.name') }}"
+MAGENTO_SEARCH_CONTAINER:       "{{ applications | get_app_conf(application_id, 'docker.services.search.name') }}"
+
+## PHP
+MAGENTO_PHP_VERSION:            "{{ applications | get_app_conf(application_id, 'docker.services.php.version') }}"
+MAGENTO_PHP_IMAGE:              "{{ applications | get_app_conf(application_id, 'docker.services.php.image') }}"
+MAGENTO_PHP_CONTAINER:          "{{ applications | get_app_conf(application_id, 'docker.services.php.name') }}"
+
+## NGINX
+MAGENTO_NGINX_VERSION:          "{{ applications | get_app_conf(application_id, 'docker.services.nginx.version') }}"
+MAGENTO_NGINX_IMAGE:            "{{ applications | get_app_conf(application_id, 'docker.services.nginx.image') }}"
+MAGENTO_NGINX_CONTAINER:        "{{ applications | get_app_conf(application_id, 'docker.services.nginx.name') }}"
+
+## Credentials
+MAGENTO_REPO_PUBLIC_KEY:        "{{ applications | get_app_conf(application_id, 'credentials.adobe_public_key') }}"
+MAGENTO_REPO_PRIVATE_KEY:       "{{ applications | get_app_conf(application_id, 'credentials.adobe_private_key') }}"

roles/web-app-mastodon/templates/env.j2

@@ -6,7 +6,13 @@
 LOCAL_DOMAIN={{ domains | get_domain(application_id) }}
 ALTERNATE_DOMAINS="{{ domains['web-app-mastodon'][1:] | join(',') }}"
 SINGLE_USER_MODE={{ applications | get_app_conf(application_id, 'single_user_mode') }}
-ALLOWED_PRIVATE_ADDRESSES={{ MASTODON_ALLOWED_PRIVATE_ADDRESSES }}
+ALLOWED_PRIVATE_ADDRESSES="{{ MASTODON_ALLOWED_PRIVATE_ADDRESSES }}"
+
+# Debug
+{% if MODE_DEBUG | bool %}
+RAILS_LOG_LEVEL=debug
+DEBUG=*
+{% endif %}
 
 # Credentials
 

roles/web-app-matrix/tasks/01_docker.yml

@@ -67,7 +67,6 @@
   notify: docker compose up
 
 # Pull image when update is wished. 
-# @todo This should be moved to update-docker
 - name: docker compose pull
   command:
     cmd: docker-compose -p "{{ MATRIX_PROJECT }}" pull

roles/web-app-nextcloud/tasks/01_fullstack.yml

@@ -1,4 +1,4 @@
-- name: "include role for {{ application_id }} to receive certs & do modification routines for '{{ domain }}:{{ port }}'"
+- name: "include role for {{ application_id }} to receive certs & do modification routines for '{{ NEXTCLOUD_DOMAIN }}:{{ NEXTCLOUD_PORT }}'"
   include_role:
     name: sys-util-csp-cert
 

tests/unit/cli/build/test_tree_include_role_dependencies.py

@@ -28,8 +28,8 @@ class TestTreeIncludeRoleDependencies(unittest.TestCase):
             "sys-ctl-hlth-csp",
             "svc-db-postgres",
             "svc-db-mysql",
-            "axb",          # für a{{database_type}}b → a*b
+            "axb",          # für a{{ database_type }}b → a*b
-            "ayyb",         # für a{{database_type}}b → a*b
+            "ayyb",         # für a{{ database_type }}b → a*b
             "literal-role", # für reinen Literalnamen
         ]
         for r in self.roles_to_create:
@@ -46,15 +46,15 @@ class TestTreeIncludeRoleDependencies(unittest.TestCase):
 
 - name: Pattern with literal + var suffix
   include_role:
-    name: "svc-db-{{database_type}}"
+    name: "svc-db-{{ database_type }}"
 
 - name: Pattern with literal prefix/suffix around var
   include_role:
-    name: "a{{database_type}}b"
+    name: "a{{ database_type }}b"
 
 - name: Pure variable only (should be ignored)
   include_role:
-    name: "{{database_type}}"
+    name: "{{ database_type }}"
 
 - name: Pure literal include
   include_role:
@@ -115,10 +115,10 @@ class TestTreeIncludeRoleDependencies(unittest.TestCase):
         expected = sorted([
             "sys-ctl-hlth-webserver", # aus loop
             "sys-ctl-hlth-csp",       # aus loop
-            "svc-db-postgres",        # aus svc-db-{{database_type}}
+            "svc-db-postgres",        # aus svc-db-{{ database_type }}
-            "svc-db-mysql",           # aus svc-db-{{database_type}}
+            "svc-db-mysql",           # aus svc-db-{{ database_type }}
-            "axb",                    # aus a{{database_type}}b
+            "axb",                    # aus a{{ database_type }}b
-            "ayyb",                   # aus a{{database_type}}b
+            "ayyb",                   # aus a{{ database_type }}b
             "literal-role",           # reiner Literalname
         ])
 
@@ -129,8 +129,8 @@ class TestTreeIncludeRoleDependencies(unittest.TestCase):
         )
         self.assertEqual(deps, expected, "include_role dependencies mismatch")
 
-        # Sicherstellen, dass der pure Variable-Name "{{database_type}}" NICHT aufgenommen wurde
+        # Sicherstellen, dass der pure Variable-Name "{{ database_type }}" NICHT aufgenommen wurde
-        self.assertNotIn("{{database_type}}", deps, "pure variable include should be ignored")
+        self.assertNotIn("{{ database_type }}", deps, "pure variable include should be ignored")
 
         # Sicherstellen, dass im Original-meta der Producer-Role nichts geschrieben wurde
         original_tree_path = os.path.join(self.producer_path, "meta", "tree.json")