Deactivated on_failure for telegram and email

Use `systemd-escape --unescape` to restore human-readable unit identifiers in
Telegram and Email alerts. Also ensure Telegram messages are URL-encoded and
Email status checks try both raw and escaped forms for robustness.

Fixes issue where slashes were shown as dashes in notifications.

Context: see ChatGPT conversation
https://chatgpt.com/share/68a4c171-db08-800f-8399-7e07f237a441

cli/build/role_include.py

@@ -102,8 +102,10 @@ def find_cycle(roles):
 def topological_sort(graph, in_degree, roles=None):
     """
     Perform topological sort on the dependency graph.
-    If `roles` is provided, on error it will include detailed debug info.
+    If a cycle is detected, raise an Exception with detailed debug info.
     """
+    from collections import deque
+
     queue = deque([r for r, d in in_degree.items() if d == 0])
     sorted_roles = []
     local_in = dict(in_degree)
@@ -117,28 +119,26 @@ def topological_sort(graph, in_degree, roles=None):
                 queue.append(nbr)
 
     if len(sorted_roles) != len(in_degree):
+        # Something went wrong: likely a cycle
         cycle = find_cycle(roles or {})
-        if roles is not None:
-            if cycle:
-                header = f"Circular dependency detected: {' -> '.join(cycle)}"
-            else:
-                header = "Circular dependency detected among the roles!"
+        unsorted = [r for r in in_degree if r not in sorted_roles]
 
-            unsorted = [r for r in in_degree if r not in sorted_roles]
-            detail_lines = ["Unsorted roles and their dependencies:"]
+        header = "❌ Dependency resolution failed"
+        if cycle:
+            reason = f"Circular dependency detected: {' -> '.join(cycle)}"
+        else:
+            reason = "Unresolved dependencies among roles (possible cycle or missing role)."
+
+        details = []
+        if unsorted:
+            details.append("Unsorted roles and their declared run_after dependencies:")
             for r in unsorted:
                 deps = roles.get(r, {}).get('run_after', [])
-                detail_lines.append(f" - {r} depends on {deps!r}")
+                details.append(f"  - {r} depends on {deps!r}")
 
-            detail_lines.append("Full dependency graph:")
-            detail_lines.append(f" {dict(graph)!r}")
+        graph_repr = f"Full dependency graph: {dict(graph)!r}"
 
-            raise Exception("\n".join([header] + detail_lines))
-        else:
-            if cycle:
-                raise Exception(f"Circular dependency detected: {' -> '.join(cycle)}")
-            else:
-                raise Exception("Circular dependency detected among the roles!")
+        raise Exception("\n".join([header, reason] + details + [graph_repr]))
 
     return sorted_roles
 

cli/build/tree.py

@@ -2,8 +2,12 @@
 import os
 import argparse
 import json
+import fnmatch
+import re
 from typing import Dict, Any
 
+import yaml
+
 from cli.build.graph import build_mappings, output_graph
 
 
@@ -15,45 +19,155 @@ def find_roles(roles_dir: str):
             yield entry, path
 
 
+def _is_pure_jinja_var(s: str) -> bool:
+    """Check if string is exactly a single {{ var }} expression."""
+    return bool(re.fullmatch(r"\s*\{\{\s*[^}]+\s*\}\}\s*", s))
+
+
+def _jinja_to_glob(s: str) -> str:
+    """Convert Jinja placeholders {{ ... }} into * for fnmatch."""
+    pattern = re.sub(r"\{\{[^}]+\}\}", "*", s)
+    pattern = re.sub(r"\*{2,}", "*", pattern)
+    return pattern.strip()
+
+
+def _list_role_dirs(roles_dir: str) -> list[str]:
+    """Return a list of role directory names inside roles_dir."""
+    return [
+        d for d in os.listdir(roles_dir)
+        if os.path.isdir(os.path.join(roles_dir, d))
+    ]
+
+
+def find_include_role_dependencies(role_path: str, roles_dir: str) -> set[str]:
+    """
+    Scan all tasks/*.yml(.yaml) files of a role and collect include_role dependencies.
+
+    Rules:
+      - loop/with_items with literal strings -> add those as roles
+      - name contains jinja AND surrounding literals -> convert to glob and match existing roles
+      - name is a pure jinja variable only -> ignore
+      - name is a pure literal -> add as-is
+    """
+    deps: set[str] = set()
+    tasks_dir = os.path.join(role_path, "tasks")
+    if not os.path.isdir(tasks_dir):
+        return deps
+
+    candidates = []
+    for root, _, files in os.walk(tasks_dir):
+        for f in files:
+            if f.endswith(".yml") or f.endswith(".yaml"):
+                candidates.append(os.path.join(root, f))
+
+    all_roles = _list_role_dirs(roles_dir)
+
+    def add_literal_loop_items(loop_val):
+        if isinstance(loop_val, list):
+            for item in loop_val:
+                if isinstance(item, str) and item.strip():
+                    deps.add(item.strip())
+
+    for file_path in candidates:
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                docs = list(yaml.safe_load_all(f))
+        except Exception:
+            # Be tolerant to any parsing issues; skip unreadable files
+            continue
+
+        for doc in docs:
+            if not isinstance(doc, list):
+                continue
+            for task in doc:
+                if not isinstance(task, dict):
+                    continue
+                if "include_role" not in task:
+                    continue
+                inc = task.get("include_role")
+                if not isinstance(inc, dict):
+                    continue
+                name = inc.get("name")
+                if not isinstance(name, str) or not name.strip():
+                    continue
+
+                # 1) Handle loop/with_items
+                loop_val = task.get("loop", task.get("with_items"))
+                if loop_val is not None:
+                    add_literal_loop_items(loop_val)
+                    # still check name for surrounding literals
+                    if not _is_pure_jinja_var(name):
+                        pattern = (
+                            _jinja_to_glob(name)
+                            if ("{{" in name and "}}" in name)
+                            else name
+                        )
+                        if "*" in pattern:
+                            for r in all_roles:
+                                if fnmatch.fnmatch(r, pattern):
+                                    deps.add(r)
+                    continue
+
+                # 2) No loop: evaluate name
+                if "{{" in name and "}}" in name:
+                    if _is_pure_jinja_var(name):
+                        continue  # ignore pure variable
+                    pattern = _jinja_to_glob(name)
+                    if "*" in pattern:
+                        for r in all_roles:
+                            if fnmatch.fnmatch(r, pattern):
+                                deps.add(r)
+                        continue
+                    else:
+                        deps.add(pattern)
+                else:
+                    # pure literal
+                    deps.add(name.strip())
+
+    return deps
+
+
 def main():
     # default roles dir is ../../roles relative to this script
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    default_roles_dir = os.path.abspath(os.path.join(script_dir, '..', '..', 'roles'))
+    default_roles_dir = os.path.abspath(
+        os.path.join(script_dir, "..", "..", "roles")
+    )
 
     parser = argparse.ArgumentParser(
         description="Generate all graphs for each role and write meta/tree.json"
     )
     parser.add_argument(
-        '-d', '--role_dir',
+        "-d", "--role_dir",
         default=default_roles_dir,
         help=f"Path to roles directory (default: {default_roles_dir})"
     )
     parser.add_argument(
-        '-D', '--depth',
+        "-D", "--depth",
         type=int,
         default=0,
         help="Max recursion depth (>0) or <=0 to stop on cycle"
     )
     parser.add_argument(
-        '-o', '--output',
-        choices=['yaml', 'json', 'console'],
-        default='json',
+        "-o", "--output",
+        choices=["yaml", "json", "console"],
+        default="json",
         help="Output format"
     )
     parser.add_argument(
-        '-p', '--preview',
-        action='store_true',
+        "-p", "--preview",
+        action="store_true",
         help="Preview graphs to console instead of writing files"
     )
     parser.add_argument(
-        '-s', '--shadow-folder',
+        "-s", "--shadow-folder",
         type=str,
         default=None,
         help="If set, writes tree.json to this shadow folder instead of the role's actual meta/ folder"
     )
     parser.add_argument(
-        '-v', '--verbose',
-        action='store_true',
+        "-v", "--verbose",
+        action="store_true",
         help="Enable verbose logging"
     )
     args = parser.parse_args()
@@ -75,24 +189,32 @@ def main():
             max_depth=args.depth
         )
 
+        # add include_role dependencies from tasks
+        include_deps = find_include_role_dependencies(role_path, args.role_dir)
+        if include_deps:
+            deps_root = graphs.setdefault("dependencies", {})
+            inc_list = set(deps_root.get("include_role", []))
+            inc_list.update(include_deps)
+            deps_root["include_role"] = sorted(inc_list)
+            graphs["dependencies"] = deps_root
+
         if args.preview:
             for key, data in graphs.items():
                 if args.verbose:
                     print(f"Previewing graph '{key}' for role '{role_name}'")
-                output_graph(data, 'console', role_name, key)
+                output_graph(data, "console", role_name, key)
         else:
-            # Decide on output folder
             if args.shadow_folder:
                 tree_file = os.path.join(
-                    args.shadow_folder, role_name, 'meta', 'tree.json'
+                    args.shadow_folder, role_name, "meta", "tree.json"
                 )
             else:
-                tree_file = os.path.join(role_path, 'meta', 'tree.json')
+                tree_file = os.path.join(role_path, "meta", "tree.json")
             os.makedirs(os.path.dirname(tree_file), exist_ok=True)
-            with open(tree_file, 'w') as f:
+            with open(tree_file, "w") as f:
                 json.dump(graphs, f, indent=2)
             print(f"Wrote {tree_file}")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

filter_plugins/get_service_name.py

@@ -15,8 +15,8 @@ Suffix handling:
 """
 
 def get_service_name(systemctl_id, software_name, suffix=""):
-    sid = str(systemctl_id).strip().lower()
-    sw  = str(software_name).strip().lower()
+    sid           = str(systemctl_id).strip().lower()
+    software_name = str(software_name).strip().lower()
 
     # Determine suffix
     if suffix is False:
@@ -24,14 +24,13 @@ def get_service_name(systemctl_id, software_name, suffix=""):
     elif suffix == "" or suffix is None:
         sfx = ".service"
     else:
-        sfx = "." + str(suffix).strip().lower()
+        sfx = str(suffix).strip().lower()
 
     if sid.endswith("@"):
         base = sid[:-1]  # drop the trailing '@'
-        return f"{base}.{sw}@{sfx}"
+        return f"{base}.{software_name}@{sfx}"
     else:
-        return f"{sid}.{sw}{sfx}"
-
+        return f"{sid}.{software_name}{sfx}"
 
 class FilterModule(object):
     def filters(self):

group_vars/all/01_modes.yml

@@ -6,4 +6,5 @@ MODE_UPDATE:  true  # Executes updates
 MODE_BACKUP:  true  # Activates the backup before the update procedure
 MODE_CLEANUP: true  # Cleanup unused files and configurations
 MODE_DEBUG:   false # This enables debugging in ansible and in the apps, You SHOULD NOT enable this on production servers
-MODE_RESET:   false # Cleans up all Infinito.Nexus files. It's necessary to run to whole playbook and not particial roles when using this function.
+MODE_RESET:   false # Cleans up all Infinito.Nexus files. It's necessary to run to whole playbook and not particial roles when using this function.
+MODE_ASSERT:  false # Executes validation tasks during the run.

group_vars/all/07_services.yml

@@ -5,7 +5,6 @@
 SYS_SERVICE_SUFFIX:                   ".{{ SOFTWARE_NAME | lower }}.service"
 
 ## Names
-SYS_SERVICE_CLEANUP_BACKUPS_OLD:      "{{ 'sys-ctl-cln-bkps'        | get_service_name(SOFTWARE_NAME) }}"
 SYS_SERVICE_CLEANUP_BACKUPS_FAILED:   "{{ 'sys-ctl-cln-faild-bkps'  | get_service_name(SOFTWARE_NAME) }}"
 SYS_SERVICE_OPTIMIZE_DRIVE:           "{{ 'svc-opt-ssd-hdd'         | get_service_name(SOFTWARE_NAME) }}"
 SYS_SERVICE_BACKUP_RMT_2_LOC:         "{{ 'svc-bkp-rmt-2-loc'       | get_service_name(SOFTWARE_NAME) }}"
@@ -14,7 +13,7 @@ SYS_SERVICE_REPAIR_DOCKER_HARD:       "{{ 'sys-ctl-rpr-docker-hard' | get_servic
 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,'%i.service') }}"
+SYS_SERVICE_ON_FAILURE_COMPOSE:       "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
 
 ## Groups
 SYS_SERVICE_GROUP_BACKUPS: >

group_vars/all/08_timer.yml

@@ -2,7 +2,6 @@
 # Service Timers
 
 ## Meta
-SYS_TIMER_SUFFIX:       ".{{ SOFTWARE_NAME | lower }}.timer"
 SYS_TIMER_ALL_ENABLED:  "{{ not MODE_DEBUG }}"   # Runtime Variables for Process Control - Activates all timers, independend if the handlers had been triggered
 
 ## Server Tact Variables 

group_vars/all/09_networks.yml

@@ -84,7 +84,7 @@ defaults_networks:
       subnet: 192.168.103.64/28
     web-app-syncope:
       subnet: 192.168.103.80/28
-    web-app-collabora:
+    web-svc-collabora:
       subnet: 192.168.103.96/28
     web-svc-simpleicons:
       subnet: 192.168.103.112/28

group_vars/all/09_ports.yml

@@ -63,7 +63,7 @@ ports:
       web-app-navigator: 8039
       web-app-espocrm: 8040
       web-app-syncope: 8041
-      web-app-collabora: 8042
+      web-svc-collabora: 8042
       web-app-mobilizon: 8043
       web-svc-simpleicons: 8044
       web-app-libretranslate: 8045

roles/pkgmgr/tasks/01_core.yml

@@ -12,6 +12,7 @@
     name: github.com
     key: "{{ lookup('pipe', 'ssh-keyscan -t ed25519 github.com | grep -v \"^#\"') }}"
   become: true
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
 
 - name: Create installation directory for Kevin's Package Manager
   file:
@@ -37,7 +38,7 @@
 - name: create config.yaml
   template:
     src: config.yaml.j2
-    dest: "{{pkgmgr_config_path}}"
+    dest: "{{ pkgmgr_config_path }}"
   become: true
 
 - name: Run the Package Manager install command to create an alias for Kevins package manager

roles/srv-web-7-4-core/templates/nginx.conf.j2

@@ -36,8 +36,6 @@ http
                   '"X-Forwarded-For: $http_x_forwarded_for" '
                   '"Scheme: $scheme" "Protocol: $server_protocol" "ServerName: $server_name"';
   access_log  /dev/stdout  debug;
-{% else %}
-  access_log  /dev/stdout  debug;
 {% endif %}
   error_log  /dev/stderr  info;
 

roles/svc-bkp-loc-2-usb/tasks/main.yml

@@ -21,6 +21,7 @@
         - target
         - source
       to non‑empty values in your configuration file.
+  when: MODE_ASSERT | bool
 
 - include_role:
     name: sys-service

roles/svc-bkp-loc-2-usb/templates/systemctl.service.j2

@@ -6,7 +6,6 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStart={{ system_service_script_exec }} {{ BACKUP_TO_USB_SOURCE }} {{ BACKUP_TO_USB_DESTINATION }}
-ExecStartPost=/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS_OLD }}
 
 [Install]
 WantedBy=multi-user.target

roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2

@@ -4,6 +4,6 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 
 [Service]
 Type=oneshot
-ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS| join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
+ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
 ExecStart={{ system_service_script_exec }}
-ExecStartPost=/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS_OLD }}
+

roles/svc-opt-ssd-hdd/schema/main.yml

@@ -4,8 +4,8 @@ credentials:
     algorithm: "bcrypt"
     validation: "^\\$2[aby]\\$.{56}$"
 
-OPT_DRIVE_RAPID_STORAGE_PATH:
+rapid_storage:
   description: "Mount path of the servers SSD"
 
-OPT_DRIVE_MASS_STORAGE_PATH:
+mass_storage:
   description: "Mount path of the servers HDD"

roles/svc-opt-ssd-hdd/tasks/main.yml

@@ -1,2 +1,5 @@
 - include_role:
-    name: sys-service
+    name: sys-service
+  vars:
+    system_service_tpl_exec_start_pre: '/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(" ")  }} --ignore {{ SYS_SERVICE_OPTIMIZE_DRIVE }} {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_STORAGE_OPTIMIZER }}"'
+    system_service_tpl_exec_start:      '{{ system_service_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }} --rapid-storage-path {{ OPT_DRIVE_RAPID_STORAGE_PATH }}'

roles/svc-opt-ssd-hdd/templates/systemctl.service.j2

@@ -1,8 +0,0 @@
-[Unit]
-Description=Optimize storage paths
-OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
-
-[Service]
-Type=oneshot
-ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_OPTIMIZE_DRIVE }} {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_STORAGE_OPTIMIZER }}"
-ExecStart={{ system_service_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }}

roles/svc-opt-ssd-hdd/vars/main.yml

@@ -1,4 +1,4 @@
 application_id:               svc-opt-ssd-hdd
-system_service_id:                 "{{ application_id }}"
+system_service_id:            "{{ application_id }}"
 OPT_DRIVE_RAPID_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.rapid_storage') }}"
 OPT_DRIVE_MASS_STORAGE_PATH:  "{{ applications | get_app_conf(application_id, 'volumes.mass_storage') }}"

roles/svc-prx-openresty/handlers/main.yml

@@ -1,13 +1,4 @@
 ---
-- name: Wait until OpenResty container is running
-  command: docker inspect -f '{{.State.Running}}' {{ OPENRESTY_CONTAINER }}
-  register: openresty_status
-  retries: 10
-  delay: 3
-  until: openresty_status.stdout.strip() == "true"
-  changed_when: false
-  listen: restart openresty
-
 - name: Validate OpenResty configuration
   command: >
     docker exec {{ OPENRESTY_CONTAINER }} openresty -t -q

roles/sys-ctl-alm-compose/tasks/01_core.yml

@@ -6,20 +6,32 @@
     - sys-ctl-alm-email
   vars:
     flush_handlers: true
-    systemctl_timer_enabled: false
-    systemctl_copy_files: true
+    system_service_timer_enabled: false
+    system_service_copy_files: true
+    system_service_tpl_exec_start: "{{ system_service_script_exec }} %I"
+    system_service_tpl_on_failure: ""
 
 - name: "Include core service for '{{ system_service_id  }}'"
   include_role:
     name: sys-service
   vars:
     flush_handlers: true
-    systemctl_timer_enabled: false
-    systemctl_copy_files: true
-    systemctl_tpl_exec_start: "{{ system_service_script_exec }} %i"
-    systemctl_tpl_on_failure: "" # No on failure needed, because it's anyhow the default on failure procedure
+    system_service_timer_enabled: false
+    system_service_copy_files: true
+    system_service_tpl_exec_start: "{{ system_service_script_exec }} %I"
+    system_service_tpl_on_failure: "" # No on failure needed, because it's anyhow the default on failure procedure
 
-- name: "Send message to test service."
-  systemd:
-    name: "sys-ctl-alm-compose@{{ SYSTEMCTL_ALARM_COMPOSER_DUMMY_MESSAGE }}.service"
-    state: started
+- block:
+  - name: Escape instance name for systemctl call
+    ansible.builtin.command:
+      argv:
+        - systemd-escape
+        - "{{ SYSTEMCTL_ALARM_COMPOSER_DUMMY_MESSAGE }}"
+    register: escaped_name
+    changed_when: false
+
+  - name: Start sys-ctl-alm-compose instance
+    ansible.builtin.systemd:
+      name: "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) ~ escaped_name.stdout ~ '.service' }}"
+      state: started
+  when: MODE_ASSERT | bool

roles/sys-ctl-alm-compose/templates/script.sh.j2

@@ -1,10 +1,11 @@
 #!/bin/bash
 err=0
 set -u
-{% for alarm_service in SYSTEMCTL_ALARM_COMPOSER_SUBSERVICES %}
-{% set alarm_service_full_name = alarm_service | get_service_name(SOFTWARE_NAME, '"$1".service') %}
-if ! /usr/bin/systemctl start {{ alarm_service_full_name }}; then
-  echo "ERROR: Failed to start {{ alarm_service_full_name }}" >&2
+{% for alarm in SYSTEMCTL_ALARM_COMPOSER_SUBSERVICES %}
+# sys-ctl-alm-email.infinito.nexus@<escaped>.service (no extra dot!)
+unit="{{ (alarm ~ '@') | get_service_name(SOFTWARE_NAME, False) }}$(systemd-escape "$1").service"
+if ! /usr/bin/systemctl start -- "$unit"; then
+  echo "ERROR: Failed to start $unit" >&2
   err=1
 fi
 {% endfor %}

roles/sys-ctl-alm-email/tasks/01_core.yml

@@ -6,7 +6,5 @@
 
 - include_role:
     name: sys-service
-  vars:
-    system_service_copy_files: true
 
 

roles/sys-ctl-alm-email/templates/script.sh.j2

@@ -1,15 +1,24 @@
 #!/bin/bash
+set -u
+# Reverse systemd escaping for human-readable mail subject/body
+friendly="$(systemd-escape --unescape "$1")"
+
+# Try status with given arg; if empty, also try the escaped version
+STATUS_OUT="$(systemctl status --full "$1" 2>/dev/null | head -n 30)"
+if [ -z "$STATUS_OUT" ]; then
+  esc="$(systemd-escape "$1")"
+  STATUS_OUT="$(systemctl status --full "$esc" 2>/dev/null | head -n 30)"
+fi
 
 /usr/bin/sendmail -t <<ERRMAIL
 To: {{ users.administrator.email }}
 From: systemd <{{ users['no-reply'].email }}>
-Subject: $1
+Subject: ${friendly}
 Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset=UTF-8
 
-A problem with the service $1 occured:
-
-$(systemctl status --full "$1" | head -n 30)
+A problem with the service ${friendly} occurred:
 
+$STATUS_OUT
 
 ERRMAIL

roles/sys-ctl-alm-email/templates/systemctl@.service.j2

@@ -1,8 +0,0 @@
-[Unit]
-Description=status email for %i to user
-
-[Service]
-Type=oneshot
-ExecStart={{ system_service_script_exec }} %i
-User=root
-Group=systemd-journal

roles/sys-ctl-alm-telegram/tasks/01_core.yml

@@ -8,11 +8,10 @@
       Please provide non‑empty values for:
         - telegram_bot_token   # Your Telegram bot’s API token
         - telegram_chat_id     # The Telegram chat ID to send messages to
+  when: MODE_ASSERT | bool
 
 - include_role:
     name: sys-service
-  vars:
-    system_service_copy_files: true
 
 - name: install curl
   community.general.pacman:

roles/sys-ctl-alm-telegram/templates/script.sh.j2

@@ -1,4 +1,8 @@
 #!/bin/bash
+set -u
+
+# Make the instance text human readable again (reverse systemd escaping)
+friendly="$(systemd-escape --unescape "$1")"
 
 # determine host name: try hostname command, otherwise use $HOSTNAME
 if command -v hostname &>/dev/null; then
@@ -11,4 +15,4 @@ fi
 /usr/bin/curl -s -X POST \
   "https://api.telegram.org/bot{{ telegram_bot_token }}/sendMessage" \
   -d chat_id="{{ telegram_chat_id }}" \
-  -d text="service $1 on ${host} failed"
+  --data-urlencode text="service ${friendly} on ${host} failed"

roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2

@@ -1,8 +0,0 @@
-[Unit]
-Description=status Telegram message for %i to user
-
-[Service]
-Type=oneshot
-ExecStart={{ system_service_script_exec }} %i
-User=root
-Group=systemd-journal

roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2

@@ -6,4 +6,3 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS | reject('equalto', role_name ~ '-everything') | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
 ExecStart=/bin/sh -c '{{ BKP_DOCKER_2_LOC_EXEC }}'
-ExecStartPost=/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS_OLD }}

roles/sys-daemon/tasks/01_reset.yml

@@ -7,7 +7,9 @@
     that:
       - SYSTEMD_MANAGER_CONF_DIR | regex_search('^/etc/systemd/system\.conf\.d/?$')
     fail_msg: "SYSTEMD_MANAGER_CONF_DIR must be /etc/systemd/system.conf.d"
-  when: SYSTEMD_MANAGER_RESET_PURGE | bool
+  when:
+    - SYSTEMD_MANAGER_RESET_PURGE | bool
+    - MODE_ASSERT | bool
 
 - name: "Purge manager drop-in directory (remove)"
   file:

roles/sys-dns-cloudflare-records/tasks/main.yml

@@ -5,6 +5,7 @@
   ansible.builtin.assert:
     that: [ "CLOUDFLARE_API_TOKEN | length > 0" ]
   no_log: "{{ cloudflare_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Apply A/AAAA
   community.general.cloudflare_dns:

roles/sys-dns-hetzner-rdns/tasks/flavors/cloud.yml

@@ -14,6 +14,7 @@
     that: [ "_hz_token | length > 0" ]
     fail_msg: "HETZNER_API_TOKEN is required for the Cloud flavor."
   no_log: "{{ hetzner_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Collect hcloud servers if needed (server records without identifier)
   hetzner.hcloud.server_info:
@@ -61,6 +62,7 @@
         )
     fail_msg: "Could not resolve hcloud server by IPv4 for one or more records."
   no_log: "{{ hetzner_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Validate records (cloud)
   ansible.builtin.assert:
@@ -74,6 +76,7 @@
           + ((_rdns_records | default(rdns_records)) | rejectattr('resource','equalto','server') | list | length)
         ) == ((_rdns_records | default(rdns_records)) | length)
   no_log: "{{ hetzner_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Apply rDNS via hcloud
   hetzner.hcloud.hcloud_rdns:

roles/sys-dns-hetzner-rdns/tasks/flavors/robot.yml

@@ -7,6 +7,7 @@
       - (HETZNER_ROBOT_PASSWORD | default('') | length) > 0
     fail_msg: "Robot credentials required: HETZNER_ROBOT_USER / HETZNER_ROBOT_PASSWORD."
   no_log: "{{ hetzner_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Validate records (robot)
   ansible.builtin.assert:
@@ -16,6 +17,7 @@
       - (rdns_records | selectattr('dns_ptr','defined') | list | length) == (rdns_records | length)
     fail_msg: "Each record must have ip_address and dns_ptr for Robot rDNS."
   no_log: "{{ hetzner_no_log | bool }}"
+  when: MODE_ASSERT | bool
 
 - name: Apply rDNS via Hetzner Robot API
   vars:

roles/sys-service/tasks/05_service.yml

@@ -1,4 +1,3 @@
-# 1) Find the template (prefer target role, then fall back to this role)
 - name: Resolve systemctl template source
   set_fact:
     system_service_template_src: >-
@@ -17,31 +16,29 @@
            errors='strict'
          ) }}
 
-# Optional: sanity check with a clear error if truly nothing found
 - name: Ensure a systemctl template was found
   assert:
     that: system_service_template_src | length > 0
     fail_msg: >-
       Could not resolve any systemctl template. Looked in:
       {{ system_service_role_dir }}/templates/ and {{ role_path }}/templates/.
+  when: MODE_ASSERT | bool
 
-# 2) Now we may safely derive whether it’s the “@” variant
 - name: Flag whether @-template is used
   set_fact:
-    system_service_uses_at: "{{ (system_service_template_src | basename) is search('@\\.service\\.j2$') }}"
+    system_service_uses_at: "{{ system_service_id.endswith('@') }}"
 
-# 3) Use it
 - name: "setup systemctl '{{ system_service_id }}'"
   template:
     src:  "{{ system_service_template_src }}"
     dest: "{{ [ PATH_SYSTEM_SERVICE_DIR, system_service_id | get_service_name(SOFTWARE_NAME) ] | path_join }}"
   notify: "{{ 'reload system daemon' if system_service_uses_at else 'refresh systemctl service' }}"
 
-- name:   refresh systemctl service when SYS_SERVICE_ALL_ENABLED
-  command: /bin/true
-  notify:
-    - reload system daemon
-    - refresh systemctl service
-  when: 
-    - SYS_SERVICE_ALL_ENABLED | bool
-    - not system_service_uses_at
+- name: refresh systemctl service when SYS_SERVICE_ALL_ENABLE
+  block:
+  - command: /bin/true
+    notify: reload system daemon
+  - command: /bin/true
+    notify: refresh systemctl service
+    when: not system_service_uses_at
+  when: SYS_SERVICE_ALL_ENABLED | bool

roles/sys-service/tasks/06_timer.yml

@@ -3,6 +3,7 @@
     that:
       - "'@' not in system_service_id"
     fail_msg: "Invalid system_service_id '{{ system_service_id }}' → must not contain '@'."
+  when: MODE_ASSERT | bool
 
 - name: "Make '{{ system_service_id }}' available for sys-timer"
   set_fact:

roles/sys-service/templates/systemctl.service.j2

@@ -1,9 +1,14 @@
 [Unit]
 Description={{ SOFTWARE_NAME }} - Service for role '{{ system_service_id }}'
+{% if system_service_tpl_on_failure |length > 0 %}
 OnFailure={{ system_service_tpl_on_failure }}
+{% endif %}
 
 [Service]
 Type={{ system_service_tpl_type }}
+{% if system_service_tpl_exec_start_pre |length > 0 %}
+ExecStartPre={{ system_service_tpl_exec_start_pre }}
+{% endif %}
 ExecStart={{ system_service_tpl_exec_start }}
 {% if system_service_tpl_runtime |length > 0 %}
 RuntimeMaxSec={{ system_service_tpl_runtime }}

roles/sys-service/vars/main.yml

@@ -17,7 +17,8 @@ system_service_script_inter:   "/bin/{{ 'bash' if system_service_script_type ==
 system_service_script_exec:    "{{ system_service_script_inter }} {{ system_service_id | get_service_script_path( system_service_script_type ) }}"
 
 # Service template
-system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
-system_service_tpl_type:       "oneshot"
-system_service_tpl_exec_start: "{{ system_service_script_exec }}"
-system_service_tpl_runtime:    "{{ SYS_SERVICE_DEFAULT_RUNTIME }}"
+system_service_tpl_on_failure:      "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
+system_service_tpl_type:            "oneshot"
+system_service_tpl_exec_start:      "{{ system_service_script_exec }}"
+system_service_tpl_runtime:         "{{ SYS_SERVICE_DEFAULT_RUNTIME }}"
+system_service_tpl_exec_start_pre:  ""

roles/sys-svc-msmtp/templates/msmtprc.conf.j2

@@ -10,11 +10,11 @@ tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls            off
 {% endif %}
 
-account        {{ DEFAULT_EMAIL_ACCOUNT }}
+account        system_email_no_reply
 host           {{ SYSTEM_EMAIL.HOST }}
 port           {{ SYSTEM_EMAIL.PORT }}
 from           {{ users['no-reply'].email }}
 user           {{ users['no-reply'].email }}
 password       {{ users['no-reply'].mailu_token }}
 
-account default : {{ DEFAULT_EMAIL_ACCOUNT }}
+account default : system_email_no_reply

roles/sys-svc-msmtp/vars/main.yml

@@ -1 +0,0 @@
-DEFAULT_EMAIL_ACCOUNT: "{{ SOFTWARE_NAME | replace('.', '_') | lower }}__default_email_account"

roles/sys-timer/vars/main.yml

@@ -1 +1 @@
-sys_timer_file: "{{ system_service_timer_service }}{{ SYS_TIMER_SUFFIX }}"
+sys_timer_file: "{{ system_service_timer_service | get_service_name(SOFTWARE_NAME,'.timer') }}"

roles/user-administrator/tasks/01_core.yml

@@ -12,6 +12,7 @@
     generate_ssh_key: yes
     ssh_key_type: rsa
     ssh_key_bits: 8192
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"  
 
 - name: "set correct rights for {{ PATH_ADMINISTRATOR_HOME }}"
   file:

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

@@ -3,7 +3,7 @@
   web:
     image: "{{ applications | get_app_conf(application_id, 'images.web', True) }}"
     ports:
-    - "{{ports.localhost.http[application_id]}}:80"
+    - "{{ ports.localhost.http[application_id] }}:80"
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www

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

@@ -7,7 +7,7 @@
     volumes:
       - data:/baserow/data
     ports:
-      - "{{ports.localhost.http[application_id]}}:80"
+      - "{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 

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

@@ -1,17 +0,0 @@
-- name: create collabora proxy configuration file
-  template: 
-    src:  "nginx.conf.j2" 
-    dest: "{{ NGINX.DIRECTORIES.HTTP.SERVERS }}{{ domains | get_domain(application_id) }}.conf"
-  notify: restart openresty
-
-- name: "Include docker-compose role"
-  include_role: 
-    name: docker-compose
-
-- name: Create Docker network for Collabora
-  community.docker.docker_network:
-    name: svc-db-mariadb
-    state: present
-    ipam_config:
-      - subnet: "{{ networks.local[application_id].subnet }}"
-

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

@@ -1,13 +0,0 @@
-{% include 'roles/docker-compose/templates/base.yml.j2' %}
-
-  collabora:
-    image: collabora/code
-    container_name: collabora
-    ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
-
-{% include 'roles/docker-container/templates/base.yml.j2' %}
-{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
-{% include 'roles/docker-container/templates/networks.yml.j2' %}
-
-{% include 'roles/docker-compose/templates/networks.yml.j2' %}

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

@@ -1,4 +0,0 @@
-domain=nxsrv
-username=admin
-password=${COLLABRA_PASSWORD}
-extra_params=--o:ssl.enable=false --o:ssl.termination=true

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

@@ -1,2 +0,0 @@
----
-application_id: web-app-collabora

roles/web-app-discourse/tasks/02_reset.yml

@@ -16,6 +16,7 @@
       - docker_compose is defined
       - ports is defined
     fail_msg: "Load roles/docker-compose/vars/docker-compose.yml and set `database_type` first."
+  when: MODE_ASSERT | bool
 
 - name: "Disconnect DB container from Discourse networks"
   ansible.builtin.command:

roles/web-app-discourse/templates/config.yml.j2

@@ -15,7 +15,7 @@ templates:
 ## If you want Discourse to share a port with another webserver like Apache or nginx,
 ## see https://meta.discourse.org/t/17247 for details
 expose:
-  - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"   # http
+  - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"   # http
 
 params:
   db_default_text_search_config: "pg_catalog.english"

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

@@ -57,7 +57,7 @@
         target: /usr/share/kibana/config/kibana.yml
         read_only: true
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:5601"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:5601"
     depends_on:
       - elasticsearch
 

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

@@ -8,7 +8,7 @@
       - data:/var/www/data # I assume that this one is unnessecarry
       - {{ friendica_host_ldap_config }}:{{ friendica_docker_ldap_config }}:ro 
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
 
 {% include 'roles/docker-container/templates/healthcheck/msmtp_curl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}

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

@@ -49,7 +49,7 @@
       - "data:{{funkwhale_media_root}}:ro"
       #- "{{funkwhale_static_root}}:{{funkwhale_static_root}}:ro"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
   
   typesense:
 {% include 'roles/docker-container/templates/base.yml.j2' %}

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

@@ -5,7 +5,7 @@
     image: "{{ gitea_image }}:{{ gitea_version }}"
     container_name:  "{{ gitea_container }}"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
       - "{{ports.public.ssh[application_id]}}:22"
     volumes:
       - data:/data

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

@@ -5,7 +5,7 @@
     hostname: '{{ domains | get_domain(application_id) }}'
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
       - "{{ports.public.ssh[application_id]}}:22"
     volumes:
       - 'config:/etc/gitlab'

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

@@ -3,7 +3,7 @@
       image: jenkins/jenkins:lts
       restart: "{{ DOCKER_RESTART_POLICY }}"
       ports:
-        - "127.0.0.1:{{ports.localhost.http[application_id]}}:8080"
+        - "127.0.0.1:{{ ports.localhost.http[application_id] }}:8080"
       volumes:
         - jenkins_data:/var/jenkins_home
       log_driver: journald

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

@@ -5,7 +5,7 @@
     volumes:
       - data:/var/www/html
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 

roles/web-app-keycloak/tasks/05_rbac_client_scope.yml

@@ -46,6 +46,7 @@
       - scope_id_rbac | length > 0
       - (app_client_id_cmd.stdout | trim) is match('^[0-9a-f-]+$')
     fail_msg: "Could not determine client or scope ID."
+  when: MODE_ASSERT | bool
 
 - name: Get current optional client scopes
   shell: >

roles/web-app-keycloak/tasks/06_ldap.yml

@@ -26,6 +26,7 @@
   assert:
     that: [ "(ldap_cmp_id.stdout | trim) not in ['', 'null']" ]
     fail_msg: "LDAP component '{{ KEYCLOAK_LDAP_CMP_NAME }}' not found in Keycloak."
+  when: MODE_ASSERT | bool
 
 - name: Pull LDAP component from dictionary (by name)
   set_fact:
@@ -42,6 +43,7 @@
       - ldap_component_tpl | length > 0
       - (ldap_component_tpl.subComponents | default({})) | length > 0
     fail_msg: "LDAP component '{{ KEYCLOAK_LDAP_CMP_NAME }}' not found in KEYCLOAK_DICTIONARY_REALM."
+  when: MODE_ASSERT | bool
 
 - name: Extract mapper 'ldap-roles' from template (raw)
   set_fact:
@@ -59,6 +61,7 @@
   assert:
     that: [ "desired_group_mapper_raw | length > 0" ]
     fail_msg: "'ldap-roles' mapper not found in dictionary under LDAP component."
+  when: MODE_ASSERT | bool
 
 - name: Build clean mapper payload
   set_fact:

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

@@ -18,6 +18,7 @@
       - kc_lookup_value is defined
       - kc_desired is defined
     fail_msg: "kc_object_kind, kc_lookup_value, kc_desired are required."
+  when: MODE_ASSERT | bool
 
 - name: Derive API endpoint and lookup field
   set_fact:
@@ -67,6 +68,7 @@
       - (kc_obj_id | trim) != ''
       - (kc_obj_id | trim) != 'null'
     fail_msg: "{{ kc_object_kind | capitalize }} '{{ kc_lookup_value }}' not found."
+  when: MODE_ASSERT | bool
 
 - name: Read current object
   shell: >
@@ -85,6 +87,7 @@
   when:
     - kc_object_kind == 'component'
     - (kc_desired.providerId is defined)
+    - MODE_ASSERT | bool
   assert:
     that:
       - cur_obj.providerId == kc_desired.providerId

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

@@ -4,7 +4,7 @@
     container_name: "{{ lam_container }}"
     image: "{{ lam_image }}"
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:80 
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:80 
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 

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

@@ -5,7 +5,7 @@
     image: "{{ LISTMONK_IMAGE }}:{{ LISTMONK_VERSION }}"
     container_name: "{{ LISTMONK_NAME }}"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
     volumes:
       - {{docker_compose.directories.config}}config.toml:/listmonk/config.toml
 {% include 'roles/docker-container/templates/networks.yml.j2' %}

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

@@ -6,6 +6,7 @@
       - MAILU_HOSTNAMES | length <= 1
     fail_msg: "MAILU_HOSTNAMES must be a list with at most one entry (only one host is supported). You can set the other ones as alias."
     success_msg: "MAILU_HOSTNAMES is valid."
+  when: MODE_ASSERT | bool
 
 - name: "Mailu Docker and Webserver Setup"
   block:

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

@@ -13,7 +13,7 @@
     image: {{ MAILU_DOCKER_FLAVOR }}/nginx:{{ MAILU_VERSION }}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
       - "{{ MAILU_IP4_PUBLIC }}:25:25"
       - "{{ MAILU_IP4_PUBLIC }}:465:465"
       - "{{ MAILU_IP4_PUBLIC }}:587:587"

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

@@ -9,7 +9,7 @@
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p {{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
     volumes:
       - data:/mastodon/public/system

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

@@ -5,7 +5,7 @@
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     image: "{{ matomo_image }}:{{ matomo_version }}"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
     volumes:
       - data:/var/www/html
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}

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

@@ -6,7 +6,7 @@
       volumes:
         - "data:/var/www/html/"
       ports:
-        - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+        - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 

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

@@ -1,14 +1,14 @@
 docker:
   services:
     redis:
-      enabled:        false # No redis needed
+      enabled:  false # No redis needed
     database:
-      enabled:        false # No database needed
+      enabled:  false # No database needed
 features:
-  matomo:             true  # activate tracking
-  css:                true  # use custom infinito stile 
-  desktop:    true  # Enable in port-ui
-  logout:             false
+  matomo:       true  # activate tracking
+  css:          true  # use custom infinito stile 
+  desktop:      true  # Enable in port-ui
+  logout:       false
 server:
   csp:
     whitelist:

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

@@ -6,7 +6,7 @@
     image: "{{ MIG_IMAGE }}"
     container_name: "{{ MIG_CONTAINER }}"
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
     build:
       context:    "{{docker_repository_path}}"
       dockerfile: Dockerfile

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

@@ -8,7 +8,7 @@
       dockerfile: Dockerfile
     image: moodle_custom
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     volumes:
       - 'code:{{ bitnami_code_link }}'

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

@@ -20,7 +20,7 @@
     image: nginx:mainline
     restart: {{ DOCKER_RESTART_POLICY }}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
     volumes:
     - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
     - "data:/var/www/html:ro"

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

@@ -4,7 +4,7 @@
       context:    {{ path_infinito_presentation_output.stdout }}
       dockerfile: {{ path_infinito_presentation_output.stdout }}/Dockerfile
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:5000"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:5000"
     volumes:
       - {{ path_infinito_presentation_output.stdout }}:/app
       - {{ path_infinito_output.stdout }}:/source

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

@@ -9,11 +9,14 @@ server:
     whitelist:
       font-src:
         - "data:"
+      #frame-src:
+      #  - ""
   domains:
     canonical:
       - "cloud.{{ PRIMARY_DOMAIN }}"
-      # nextcloud:  "cloud.{{ PRIMARY_DOMAIN }}"
       # talk:       "talk.{{ PRIMARY_DOMAIN }}" @todo needs to be activated
+    helpers:
+      collabora: "{{ WEB_PROTOCOL ~ '://' ~ applications | get_app_conf('web-svc-collabora','server.domains.canonical[0]',False,'<< defaults_applications[web-svc-collabora].server.domains.canonical[0]>>') }}"
 docker:
   volumes:
     data: nextcloud_data
@@ -41,13 +44,8 @@ docker:
       image:    "nextcloud/aio-talk"
       version:  "latest"
       enabled:  false # Not enabled yet, because just implemented during refactoring and not tested yet. if tested activate
-    # Its in a own role. @todo remove it if it gets implemented via the other role
-    #collabora:
-    #  name:     "nextcloud-collabora"
-    #  image:    "nextcloud-collabora"
-    #  version:  "latest"
 oidc:
-  enabled:  " {{ applications | get_app_conf('web-app-nextcloud', 'features.oidc', False, True) }}"   # Activate OIDC for Nextcloud
+  enabled:  "{{ applications | get_app_conf('web-app-nextcloud', 'features.oidc', False, True) }}"   # Activate OIDC for Nextcloud
   # floavor decides which OICD plugin should be used. 
   # Available options: oidc_login, sociallogin
   # @see https://apps.nextcloud.com/apps/oidc_login
@@ -149,7 +147,7 @@ plugins:
     enabled: false
   fileslibreofficeedit:
     # Nextcloud LibreOffice integration: allows online editing of documents with LibreOffice (https://apps.nextcloud.com/apps/fileslibreofficeedit)
-    enabled: true
+    enabled: "{{ not (applications | get_app_conf('web-app-nextcloud', 'plugins.richdocuments.enabled', False, True)) }}"
   forms:
     # Nextcloud forms: facilitates creation of forms and surveys (https://apps.nextcloud.com/apps/forms)
     enabled: true
@@ -225,7 +223,7 @@ plugins:
     enabled: false # Deactivated because it let to bugs
   richdocuments:
     # Nextcloud Rich Documents: provides collaborative document editing capabilities (https://apps.nextcloud.com/apps/richdocuments)
-    enabled: false # @todo To set it default to true activate https://hub.docker.com/r/collabora/code before
+    enabled: true # @todo To set it default to true activate https://hub.docker.com/r/collabora/code before
   sociallogin:
     # Nextcloud social login: allows authentication using social networks (https://apps.nextcloud.com/apps/sociallogin)
     enabled:    "{{ _applications_nextcloud_oidc_flavor=='sociallogin' | lower }}"

roles/web-app-nextcloud/meta/main.yml

@@ -29,6 +29,5 @@ galaxy_info:
   logo:
     class: "fa-solid fa-cloud"
   run_after:
-    - web-app-collabora
     - web-app-keycloak
     - web-app-mastodon

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

@@ -9,10 +9,10 @@
     - name: Flush handlers so Nextcloud container is restarted and ready
       meta: flush_handlers
 
-    - name: "Wait until Nextcloud is reachable on port {{ports.localhost.http[application_id]}}"
+    - name: "Wait until Nextcloud is reachable on port {{ ports.localhost.http[application_id] }}"
       wait_for:
         host: 127.0.0.1
-        port: "{{ports.localhost.http[application_id]}}"
+        port: "{{ ports.localhost.http[application_id] }}"
         timeout: 120
         delay: 2
         state: started

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

@@ -1,4 +1,11 @@
 ---
+#- name: "Install Collabora Dependency"
+#  include_role:
+#    name: web-svc-collabora
+#  vars:
+#    flush_handlers: true
+#  when: NEXTCLOUD_COLLABORA_ENABLED
+
 - name: "include role for {{ application_id }} to receive certs & do modification routines"
   include_role:
     name: srv-web-7-6-composer

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

@@ -4,10 +4,10 @@
     image: "{{ nextcloud_image }}:{{ nextcloud_version }}"
     container_name: {{ nextcloud_container }}
     volumes:
-      - data:{{nextcloud_docker_work_directory}}
+      - data:{{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}
       - {{nextcloud_host_config_additives_directory}}:{{nextcloud_docker_config_additives_directory}}:ro
     healthcheck:
-      test: ["CMD", "su", "www-data", "-s", "/bin/sh", "-c", "php {{nextcloud_docker_work_directory}}occ status"]
+      test: ["CMD", "su", "www-data", "-s", "/bin/sh", "-c", "php {{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}occ status"]
       interval: 1m
       timeout: 10s
       retries: 3
@@ -39,7 +39,7 @@
       driver: journald
     restart: {{ DOCKER_RESTART_POLICY }}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
     volumes:
         - "{{ docker_compose.directories.volumes }}nginx.conf:/etc/nginx/nginx.conf:ro"
     volumes_from:
@@ -57,10 +57,10 @@
     logging:
       driver: journald
     volumes:
-      - data:{{nextcloud_docker_work_directory}}
+      - data:{{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}
     entrypoint: /cron.sh
     healthcheck:
-      test: ["CMD", "su", "www-data", "-s", "/bin/sh", "-c", "php {{nextcloud_docker_work_directory}}occ status"]
+      test: ["CMD", "su", "www-data", "-s", "/bin/sh", "-c", "php {{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}occ status"]
       interval: 1m
       timeout: 10s
       retries: 3

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

@@ -11,7 +11,7 @@ http_port:                                      "{{ ports.localhost.http[applica
 database_password:                              "{{ applications | get_app_conf(application_id, 'credentials.database_password', True)}}"
 database_type:                                  "mariadb"                                                                                   # Database flavor
 
-nextcloud_plugins_enabled:                      "{{ applications | get_app_conf(application_id, 'plugins_enabled', True) }}"
+nextcloud_plugins_enabled:                      "{{ applications | get_app_conf(application_id, 'plugins_enabled') }}"
 nextcloud_administrator_username:               "{{ applications | get_app_conf(application_id, 'users.administrator.username') }}"
 
 # Control Node
@@ -27,38 +27,45 @@ nextcloud_host_nginx_path:                      "{{ NGINX.DIRECTORIES.HTTP.SERVE
 
 # Docker
 
-nextcloud_volume:                               "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
+nextcloud_volume:                               "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
 
-nextcloud_version:                              "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.version', True) }}"
-nextcloud_image:                                "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.image', True) }}"
-nextcloud_container:                            "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.name', True) }}"
+nextcloud_version:                              "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.version') }}"
+nextcloud_image:                                "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.image') }}"
+nextcloud_container:                            "{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.name') }}"
 
-nextcloud_proxy_name:                           "{{ applications | get_app_conf(application_id, 'docker.services.proxy.name', True) }}"
-nextcloud_proxy_image:                          "{{ applications | get_app_conf(application_id, 'docker.services.proxy.image', True) }}"
-nextcloud_proxy_version:                        "{{ applications | get_app_conf(application_id, 'docker.services.proxy.version', True) }}"
+nextcloud_proxy_name:                           "{{ applications | get_app_conf(application_id, 'docker.services.proxy.name') }}"
+nextcloud_proxy_image:                          "{{ applications | get_app_conf(application_id, 'docker.services.proxy.image') }}"
+nextcloud_proxy_version:                        "{{ applications | get_app_conf(application_id, 'docker.services.proxy.version') }}"
 
-nextcloud_cron_name:                            "{{ applications | get_app_conf(application_id, 'docker.services.cron.name', True) }}"
+nextcloud_cron_name:                            "{{ applications | get_app_conf(application_id, 'docker.services.cron.name') }}"
 
-nextcloud_talk_name:                            "{{ applications | get_app_conf(application_id, 'docker.services.talk.name', True) }}"
-nextcloud_talk_image:                           "{{ applications | get_app_conf(application_id, 'docker.services.talk.image', True) }}"
-nextcloud_talk_version:                         "{{ applications | get_app_conf(application_id, 'docker.services.talk.version', True) }}"
+# Plugins 
+
+## Talk 
+nextcloud_talk_name:                            "{{ applications | get_app_conf(application_id, 'docker.services.talk.name') }}"
+nextcloud_talk_image:                           "{{ applications | get_app_conf(application_id, 'docker.services.talk.image') }}"
+nextcloud_talk_version:                         "{{ applications | get_app_conf(application_id, 'docker.services.talk.version') }}"
 nextcloud_talk_enabled:                         "{{ applications | is_docker_service_enabled(application_id, 'talk') }}"
 nextcloud_talk_stun_port:                       "{{ ports.public.stun[application_id] }}"
 # nextcloud_talk_domain:                          "{{ domains[application_id].talk }}"
 
-#nextcloud_collabora_name:                      "{{ applications | get_app_conf(application_id, 'docker.services.collabora.name', True) }}"                            
+# Collabora
+#nextcloud_collabora_name:                      "{{ applications | get_app_conf(application_id, 'docker.services.collabora.name') }}"
+NEXTCLOUD_COLLABORA_URL:                        "{{ domains | get_url('web-svc-collabora', WEB_PROTOCOL) }}"
+#NEXTCLOUD_COLLABORA_DOMAIN:                     "{{ domains | get_domain('web-svc-collabora') }}"
+NEXTCLOUD_COLLABORA_ENABLED:                    "{{ applications | get_app_conf(application_id, 'plugins.richdocuments.enabled') }}"
 
 ## User Configuration
 nextcloud_docker_user_id:                       82                                                            # UID of the www-data user
 nextcloud_docker_user:                          "www-data"                                                    # Name of the www-data user (Set here to easy change it in the future)
 
 ## Internal Paths
-nextcloud_docker_work_directory:                "/var/www/html/"                                              # Name of the workdir in which the application is stored
-nextcloud_docker_config_directory:              "{{nextcloud_docker_work_directory}}config/"                  # Folder in which the Nextcloud configurations are stored     
-nextcloud_docker_config_file:                   "{{nextcloud_docker_config_directory}}config.php"             # Path to the Nextcloud configuration file
-nextcloud_docker_config_additives_directory:    "{{nextcloud_docker_config_directory}}infinito/"                # Path to the folder which contains additional configurations
+NEXTCLOUD_DOCKER_WORK_DIRECTORY:                "/var/www/html/"                                              # Name of the workdir in which the application is stored
+NEXTCLOUD_DOCKER_CONFIG_DIRECTORY:              "{{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}config/"                  # Folder in which the Nextcloud configurations are stored     
+nextcloud_docker_config_file:                   "{{ NEXTCLOUD_DOCKER_CONFIG_DIRECTORY }}config.php"             # Path to the Nextcloud configuration file
+nextcloud_docker_config_additives_directory:    "{{ NEXTCLOUD_DOCKER_CONFIG_DIRECTORY }}infinito/"                # Path to the folder which contains additional configurations
 nextcloud_docker_include_instructions_file:     "/tmp/includes.php"                                           # Path to the temporary file which will be included to the config.php to load the additional configurations
 
 ## Execution
 nextcloud_docker_exec:                          "docker exec -u {{ nextcloud_docker_user }} {{ nextcloud_container }}" # General execute composition
-nextcloud_docker_exec_occ:                      "{{nextcloud_docker_exec}} {{ nextcloud_docker_work_directory }}occ"                            # Execute docker occ command
+nextcloud_docker_exec_occ:                      "{{nextcloud_docker_exec}} {{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}occ"   # Execute docker occ command

roles/web-app-nextcloud/vars/plugins/richdocuments.yml

@@ -0,0 +1,15 @@
+plugin_configuration:
+  - appid:       "richdocuments"
+    configkey:   "wopi_url"
+    configvalue: "{{ NEXTCLOUD_COLLABORA_URL }}"
+
+  # Optional, but helpful if you ever front Collabora by a CDN:
+  - appid:       "richdocuments"
+    configkey:   "public_wopi_url"
+    configvalue: "{{ NEXTCLOUD_COLLABORA_URL }}"
+
+  # Only use this if you terminate TLS in front and run CODE plain HTTP behind it.
+  # 0 = verify certs (recommended), 1 = skip verification
+  - appid:       "richdocuments"
+    configkey:   "disable_certificate_verification"
+    configvalue: 0

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

@@ -20,7 +20,7 @@ x-op-app: &app
     container_name: {{ openproject_proxy_name }}
     command: "./docker/prod/proxy"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
     environment:
       APP_HOST: web
     depends_on:

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

@@ -7,7 +7,7 @@
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
      - "1935:1935"  # @todo Add to ports
-     - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}" 
+     - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}" 
     volumes:
       - assets:/app/client/dist
       - data:/data

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

@@ -6,7 +6,7 @@
     container_name: pgadmin
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}

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

@@ -4,7 +4,7 @@
     container_name: {{ application_id }}
     image: leenooks/phpldapadmin:{{applications | get_app_conf(application_id, 'version', True)}}
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:8080
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 
 {% include 'roles/docker-container/templates/networks.yml.j2' %}

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

@@ -6,7 +6,7 @@
     container_name: "{{ phpmyadmin_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}

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

@@ -8,7 +8,7 @@
       - "data:/var/www/storage"
       - "./env:/var/www/.env"
     ports:
-      - "{{ports.localhost.http[application_id]}}:80"
+      - "{{ ports.localhost.http[application_id] }}:80"
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
   worker:

roles/web-app-port-ui/tasks/01_core.yml

@@ -1,5 +1,6 @@
 - name: "Validate configuration"
   include_tasks: "02_validate.yml"
+  when: MODE_ASSERT | bool
 
 - name: "load docker, proxy for '{{ application_id }}'"
   include_role:

roles/web-app-port-ui/templates/docker-compose.yml.j2

@@ -7,7 +7,7 @@
     image: application-portfolio
     container_name: portfolio
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
     volumes:
       - {{docker_repository_path}}app:/app
     restart: unless-stopped

roles/web-app-roulette-wheel/templates/docker-compose.yml.j2

@@ -4,7 +4,7 @@
         build:
             context: .
         ports:
-        - 127.0.0.1:{{ports.localhost.http[application_id]}}:8080
+        - 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
         restart: {{ DOCKER_RESTART_POLICY }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}

roles/web-app-snipe-it/templates/docker-compose.yml.j2

@@ -10,7 +10,7 @@
     volumes:
       - data:/var/lib/snipeit
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}

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

@@ -5,7 +5,7 @@
       context: {{ path_infinito_sphinx_output.stdout }}
       dockerfile: {{ path_infinito_sphinx_output.stdout }}/Dockerfile
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}

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

@@ -112,7 +112,7 @@
   taiga-gateway:
     image: nginx:alpine
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
     volumes:
       - {{docker_repository_path}}taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
       - static-data:/taiga/static

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

@@ -6,7 +6,7 @@
     build:
       context: .
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
     volumes:
       - data:{{ wordpress_docker_html_path }}
 

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

@@ -7,7 +7,7 @@
     container_name: "{{ yourls_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}

roles/web-svc-collabora/README.md

@@ -21,7 +21,7 @@ This Ansible role deploys Collabora Online (CODE) in Docker to enable real-time,
 
 ## Documentation
 
-See the role’s `README.md`, task files, and Jinja2 templates in the `roles/web-app-collabora` directory for usage examples and variable definitions.
+See the role’s `README.md`, task files, and Jinja2 templates in the `roles/web-svc-collabora` directory for usage examples and variable definitions.
 
 ## Further Resources
 

roles/web-svc-collabora/config/main.yml

@@ -8,5 +8,9 @@ docker:
       enabled: true
     database: 
       enabled: false # May this is wrong. Just set during refactoring
+    collabora:
+      image: collabora/code
+      version: latest 
+      name: collabora
 features:
   logout: false # I think collabora is more a service then a app. So no login neccessary  Propably it makes sense to rename it ;)

roles/web-svc-collabora/meta/main.yml

@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: "Kevin Veen-Birkenbach"
-  description: "Deploy Collabora Online CODE in Docker with automated proxy, networking, and environment configuration."
+  description: "Collabora Online CODE with automated proxy, networking, and environment configuration."
   license: "Infinito.Nexus NonCommercial License"
   license_url: "https://s.infinito.nexus/license"
   company: |
@@ -22,7 +22,6 @@ galaxy_info:
     - code
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://s.infinito.nexus/code/web-app-collabora"
+  documentation: "https://s.infinito.nexus/code/web-svc-collabora"
   logo:
     class: "fa-solid fa-file-code"
-  run_after: []

roles/web-svc-collabora/tasks/main.yml

@@ -0,0 +1,6 @@
+- block:
+  - name: "load docker, proxy for '{{ application_id }}'"
+    include_role:
+      name: cmp-docker-proxy
+  - include_tasks: utils/run_once.yml
+  when: run_once_web_svc_collabora is not defined

roles/web-svc-collabora/templates/docker-compose.yml.j2

@@ -0,0 +1,18 @@
+{% include 'roles/docker-compose/templates/base.yml.j2' %}
+
+  collabora:
+    {% include 'roles/docker-container/templates/base.yml.j2' %}
+    image: {{ COLLABORA_IMAGE }}
+    version: {{ COLLABORA_VERSION }}
+    container_name: {{ COLLABORA_CONTAINER }}
+    ports:
+      - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
+{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:9980/hosting/discovery"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+{% include 'roles/docker-container/templates/networks.yml.j2' %}
+
+{% include 'roles/docker-compose/templates/networks.yml.j2' %}

roles/web-svc-collabora/templates/env.j2

@@ -0,0 +1,4 @@
+domain={{ (domains | get_domain('web-app-nextcloud')) | regex_replace('\\.', '\\\\.') }}
+{# username=admin #}
+{# password={{ applications | get_app_conf('web-svc-collabora', 'credentials.admin_password', False, 'ChangeMe!') }}" #}
+extra_params=--o:ssl.enable=false --o:ssl.termination=true

roles/web-svc-collabora/templates/nginx.conf.j2

@@ -2,14 +2,21 @@ server {
   server_name {{ domain }};
 
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
-
   {% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}
-  
+
   {% include 'roles/srv-proxy-7-4-core/templates/headers/content_security_policy.conf.j2' %}
 
+  {# Normal HTTP routes (discovery, browser, assets) – no Lua injection #}
+  {% set proxy_lua_enabled = false %}
+  {% set location = "/" %}
   {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %}
 
-  {% set location = '^~ /cool/' %}
-  
+  {# Optional explicit fast path for discovery #}
+  {% set location = "= /hosting/discovery" %}
   {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %}
-}
+
+  {# WebSocket handling for Collabora #}
+  {% set location_ws = '^~ /cool/' %}
+  {% set ws_port = http_port %}
+  {% include 'roles/srv-proxy-7-4-core/templates/location/ws.conf.j2' %}
+}

roles/web-svc-collabora/vars/main.yml

@@ -0,0 +1,11 @@
+---
+# General 
+application_id:         web-svc-collabora
+# Container
+container_port:         9980
+container_healthcheck:  "/hosting/discovery"
+
+# Collabora
+COLLABORA_CONTAINER:  "{{ applications | get_app_conf(application_id, 'docker.services.collabora.name') }}"
+COLLABORA_IMAGE:      "{{ applications | get_app_conf(application_id, 'docker.services.collabora.image') }}"
+COLLABORA_VERSION:    "{{ applications | get_app_conf(application_id, 'docker.services.collabora.version') }}"

roles/web-svc-logout/templates/docker-compose.yml.j2

@@ -7,7 +7,7 @@
     image: logout
     container_name: logout
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 

roles/web-svc-simpleicons/templates/docker-compose.yml.j2

@@ -6,7 +6,7 @@
     image: simpleicons-server:latest
     container_name: simpleicons-server
     ports:
-      - "{{ports.localhost.http[application_id]}}:{{ container_port }}"
+      - "{{ ports.localhost.http[application_id] }}:{{ container_port }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}