From 9d400911f4ab11905e021c22ed7a678915e697a6 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 20 May 2025 20:46:29 +0200 Subject: [PATCH] Solved buggies --- filter_plugins/csp_filters.py | 5 ++--- roles/docker-espocrm/meta/main.yml | 2 +- roles/docker-peertube/tasks/enable-oidc.yml | 2 +- roles/docker-portfolio/tasks/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/filter_plugins/csp_filters.py b/filter_plugins/csp_filters.py index 9d90a9bd..2a52a4d0 100644 --- a/filter_plugins/csp_filters.py +++ b/filter_plugins/csp_filters.py @@ -126,10 +126,9 @@ class FilterModule(object): self.is_feature_enabled(applications, 'portfolio_iframe', application_id) and directive == 'frame-ancestors' ): - domain = domains.get('portfolio')[0] # e.g. "sub.example.com" or "example.com" - # Extract the second-level + top-level domain and prefix with "*." + domain = domains.get('portfolio')[0] sld_tld = ".".join(domain.split(".")[-2:]) # yields "example.com" - tokens.append(f"*.{sld_tld}") # yields "*.example.com" + tokens.append(f"{sld_tld}") # yields "*.example.com" # whitelist tokens += self.get_csp_whitelist(applications, application_id, directive) diff --git a/roles/docker-espocrm/meta/main.yml b/roles/docker-espocrm/meta/main.yml index 9483f3a3..b84a76e9 100644 --- a/roles/docker-espocrm/meta/main.yml +++ b/roles/docker-espocrm/meta/main.yml @@ -1,6 +1,6 @@ galaxy_info: author: "Kevin Veen-Birkenbach" - description: "EspoCRM is an open‑source CRM with workflow automation, LDAP/OIDC SSO and a lightweight UI" + description: "Empower your customer relationship management with EspoCRM, an open-source platform that combines workflow automation, seamless LDAP/OIDC SSO integration, and a sleek, lightweight user interface. Tailored for businesses of all sizes, EspoCRM enables you to manage your sales, customer interactions, and business processes with ease, fostering productivity and streamlined communication across teams." license: "CyMaIS NonCommercial License (CNCL)" license_url: "https://s.veen.world/cncl" company: | diff --git a/roles/docker-peertube/tasks/enable-oidc.yml b/roles/docker-peertube/tasks/enable-oidc.yml index ac402b42..68a2002c 100644 --- a/roles/docker-peertube/tasks/enable-oidc.yml +++ b/roles/docker-peertube/tasks/enable-oidc.yml @@ -18,5 +18,5 @@ UPDATE public.plugin SET settings = '{{ oidc_settings | to_json }}', enabled = TRUE, - uninstalled = False, + uninstalled = FALSE WHERE name = 'auth-openid-connect'; diff --git a/roles/docker-portfolio/tasks/main.yml b/roles/docker-portfolio/tasks/main.yml index 1d9512ca..a2a18222 100644 --- a/roles/docker-portfolio/tasks/main.yml +++ b/roles/docker-portfolio/tasks/main.yml @@ -56,8 +56,8 @@ dest: "{{docker_repository_path}}/app/config.yaml" notify: docker compose project setup when: - - config_file.stat.exists - run_once_docker_portfolio is not defined + - config_file.stat.exists - name: Copy default config.yaml from the role template if host-specific file does not exist template: @@ -65,8 +65,8 @@ dest: "{{docker_repository_path}}/app/config.yaml" notify: docker compose project setup when: - - not config_file.stat.exists - run_once_docker_portfolio is not defined + - not config_file.stat.exists - name: add docker-compose.yml template: