mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-29 23:08:06 +02:00
Refactor and extend role dependency resolution:
- Introduced module_utils/role_dependency_resolver.py with full support for include_role, import_role, meta dependencies, and run_after. - Refactored cli/build/tree.py to use RoleDependencyResolver (added toggles for include/import/dependencies/run_after). - Extended filter_plugins/canonical_domains_map.py with optional 'recursive' mode (ignores run_after by design). - Updated roles/web-app-nextcloud to properly include Collabora dependency. - Added comprehensive unittests under tests/unit/module_utils for RoleDependencyResolver. Ref: https://chatgpt.com/share/68a519c8-8e54-800f-83c0-be38546620d9
This commit is contained in:
@@ -9,14 +9,14 @@ server:
|
||||
whitelist:
|
||||
font-src:
|
||||
- "data:"
|
||||
#frame-src:
|
||||
# - ""
|
||||
frame-src:
|
||||
- "{{ WEB_PROTOCOL }}://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
- "{{ WEB_PROTOCOL }}://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
- "wss://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
domains:
|
||||
canonical:
|
||||
- "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
|
||||
@@ -54,11 +54,11 @@ oidc:
|
||||
features:
|
||||
matomo: true
|
||||
css: false
|
||||
desktop: true
|
||||
desktop: true
|
||||
ldap: true
|
||||
oidc: true
|
||||
central_database: true
|
||||
logout: true
|
||||
logout: true
|
||||
default_quota: '1000000000' # Quota to assign if no quota is specified in the OIDC response (bytes)
|
||||
legacy_login_mask:
|
||||
enabled: False # If true, then legacy login mask is shown. Otherwise just SSO
|
||||
|
@@ -1,10 +1,12 @@
|
||||
---
|
||||
#- name: "Install Collabora Dependency"
|
||||
# include_role:
|
||||
# name: web-svc-collabora
|
||||
# vars:
|
||||
# flush_handlers: true
|
||||
# when: NEXTCLOUD_COLLABORA_ENABLED
|
||||
- name: "Install Collabora Dependency"
|
||||
include_role:
|
||||
name: web-svc-collabora
|
||||
vars:
|
||||
flush_handlers: true
|
||||
when:
|
||||
- run_once_web_svc_collabora is not defined
|
||||
- NEXTCLOUD_COLLABORA_ENABLED
|
||||
|
||||
- name: "include role for {{ application_id }} to receive certs & do modification routines"
|
||||
include_role:
|
||||
|
Reference in New Issue
Block a user