diff --git a/plugins/filter/redirect_filters.py b/plugins/filter/redirect_filters.py deleted file mode 100644 index fd088e2027..0000000000 --- a/plugins/filter/redirect_filters.py +++ /dev/null @@ -1,35 +0,0 @@ -from ansible.errors import AnsibleFilterError - - -class FilterModule: - """ - Custom filters for redirect domain mappings - """ - - def filters(self): - return { - "add_redirect_if_group": self.add_redirect_if_group, - } - - @staticmethod - def add_redirect_if_group(redirect_list, group, source, target, group_names): - """ - Append {"source": source, "target": target} to *redirect_list* - **only** if *group* is contained in *group_names*. - - Usage in Jinja: - {{ redirect_list - | add_redirect_if_group('lam', - 'ldap.' ~ DOMAIN_PRIMARY, - domains | get_domain('web-app-lam'), - group_names) }} - """ - try: - # Make a copy so we don’t mutate the original list in place - redirects = list(redirect_list) - - if group in group_names: - redirects.append({"source": source, "target": target}) - except Exception as exc: - raise AnsibleFilterError(f"add_redirect_if_group failed: {exc}") from exc - return redirects diff --git a/roles/web-app-akaunting/meta/services.yml b/roles/web-app-akaunting/meta/services.yml index bbb1971309..38159a16bc 100644 --- a/roles/web-app-akaunting/meta/services.yml +++ b/roles/web-app-akaunting/meta/services.yml @@ -58,11 +58,10 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-akaunting/meta/variants.yml b/roles/web-app-akaunting/meta/variants.yml index 14f497ccec..9e1e4b998b 100644 --- a/roles/web-app-akaunting/meta/variants.yml +++ b/roles/web-app-akaunting/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides. Both auth-flow # variants ride the same `web-app-oauth2-proxy` sidecar in front of # the Akaunting web UI. @@ -29,6 +28,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -53,6 +55,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -60,3 +65,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-baserow/meta/services.yml b/roles/web-app-baserow/meta/services.yml index e2f51a6eae..01dbe789e8 100644 --- a/roles/web-app-baserow/meta/services.yml +++ b/roles/web-app-baserow/meta/services.yml @@ -53,11 +53,10 @@ baserow: - web-app-keycloak - web-app-mailu lifecycle: beta -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-baserow/meta/variants.yml b/roles/web-app-baserow/meta/variants.yml index 8e8cf0a7f5..bf55b2daea 100644 --- a/roles/web-app-baserow/meta/variants.yml +++ b/roles/web-app-baserow/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Both auth-flow variants ride the same # `web-app-oauth2-proxy` sidecar in front of the Baserow web UI. @@ -28,6 +27,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -52,6 +54,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -59,3 +64,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-bigbluebutton/meta/services.yml b/roles/web-app-bigbluebutton/meta/services.yml index 21e01ccc9a..b18de02db9 100644 --- a/roles/web-app-bigbluebutton/meta/services.yml +++ b/roles/web-app-bigbluebutton/meta/services.yml @@ -60,11 +60,10 @@ coturn: collabora: shared: "{{ 'web-svc-collabora' in group_names }}" enabled: "{{ 'web-svc-collabora' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-bigbluebutton/meta/variants.yml b/roles/web-app-bigbluebutton/meta/variants.yml index a3e0f6db23..dcac1e1903 100644 --- a/roles/web-app-bigbluebutton/meta/variants.yml +++ b/roles/web-app-bigbluebutton/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-bigbluebutton. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -32,6 +31,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: collabora: enabled: false @@ -57,3 +59,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-bluesky/meta/services.yml b/roles/web-app-bluesky/meta/services.yml index 05d0382445..1ab32d9504 100644 --- a/roles/web-app-bluesky/meta/services.yml +++ b/roles/web-app-bluesky/meta/services.yml @@ -87,11 +87,10 @@ broker: mem_reservation: 128m mem_limit: 256m pids_limit: 256 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-bluesky/meta/variants.yml b/roles/web-app-bluesky/meta/variants.yml index b637d85fbd..309ef7f5bf 100644 --- a/roles/web-app-bluesky/meta/variants.yml +++ b/roles/web-app-bluesky/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Both variants ride the same OIDC → # login-broker → social-app handoff (variant A+); the difference is # whether Keycloak's user storage is local (variant 0) or LDAP- @@ -31,6 +30,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -53,6 +55,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -60,3 +65,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-bookwyrm/meta/services.yml b/roles/web-app-bookwyrm/meta/services.yml index 336b00cacc..9a2d1d3962 100644 --- a/roles/web-app-bookwyrm/meta/services.yml +++ b/roles/web-app-bookwyrm/meta/services.yml @@ -65,11 +65,10 @@ bookwyrm: # nocheck: playwright-service-flag — internal sub-component (multi-entity role) worker: enabled: true -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-bookwyrm/meta/variants.yml b/roles/web-app-bookwyrm/meta/variants.yml index 45300b4c93..1e79bec8c8 100644 --- a/roles/web-app-bookwyrm/meta/variants.yml +++ b/roles/web-app-bookwyrm/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides. Both auth-flow # variants ride the same `web-app-oauth2-proxy` sidecar in front of # the BookWyrm web UI. @@ -32,6 +31,9 @@ oidc: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -59,6 +61,9 @@ oidc: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -69,3 +74,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-bridgy-fed/meta/services.yml b/roles/web-app-bridgy-fed/meta/services.yml index 76e8cfcaa6..82e3141b30 100644 --- a/roles/web-app-bridgy-fed/meta/services.yml +++ b/roles/web-app-bridgy-fed/meta/services.yml @@ -31,11 +31,10 @@ application: mem_reservation: 256m mem_limit: 1g pids_limit: 512 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-bridgy-fed/meta/variants.yml b/roles/web-app-bridgy-fed/meta/variants.yml index 4161d6152e..4c36ed9ce0 100644 --- a/roles/web-app-bridgy-fed/meta/variants.yml +++ b/roles/web-app-bridgy-fed/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-bridgy-fed. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-chess/meta/services.yml b/roles/web-app-chess/meta/services.yml index ef008cdc7b..de63851292 100644 --- a/roles/web-app-chess/meta/services.yml +++ b/roles/web-app-chess/meta/services.yml @@ -38,10 +38,9 @@ chess: local: http: 8050 lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-chess/meta/variants.yml b/roles/web-app-chess/meta/variants.yml index 2e759d1f2f..f90de0b472 100644 --- a/roles/web-app-chess/meta/variants.yml +++ b/roles/web-app-chess/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-chess. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -19,6 +18,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -31,3 +33,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-confluence/meta/services.yml b/roles/web-app-confluence/meta/services.yml index 766dd64d27..ff68d75117 100644 --- a/roles/web-app-confluence/meta/services.yml +++ b/roles/web-app-confluence/meta/services.yml @@ -41,10 +41,9 @@ confluence: - web-app-matomo - web-app-mailu lifecycle: unsupported -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-confluence/meta/variants.yml b/roles/web-app-confluence/meta/variants.yml index ea7294b1cd..53bc11efcc 100644 --- a/roles/web-app-confluence/meta/variants.yml +++ b/roles/web-app-confluence/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-confluence. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -25,6 +24,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -43,3 +45,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-decidim/meta/services.yml b/roles/web-app-decidim/meta/services.yml index 62fbb3f5b8..fe34704ba1 100644 --- a/roles/web-app-decidim/meta/services.yml +++ b/roles/web-app-decidim/meta/services.yml @@ -44,11 +44,10 @@ redis: mem_reservation: 128m mem_limit: 256m pids_limit: 128 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag oauth2: enabled: false diff --git a/roles/web-app-decidim/meta/variants.yml b/roles/web-app-decidim/meta/variants.yml index 5f19196aff..0b170c42f7 100644 --- a/roles/web-app-decidim/meta/variants.yml +++ b/roles/web-app-decidim/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-decidim. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-discourse/meta/services.yml b/roles/web-app-discourse/meta/services.yml index 03fee0e16c..3c000e7c3e 100644 --- a/roles/web-app-discourse/meta/services.yml +++ b/roles/web-app-discourse/meta/services.yml @@ -75,11 +75,10 @@ discourse: pids_limit: 1024 local_login_enabled: "{{ not (lookup('config', 'web-app-discourse', 'services.oidc.enabled') | bool) or (lookup('config', 'web-app-discourse', 'services.ldap.enabled') | bool) }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-discourse/meta/variants.yml b/roles/web-app-discourse/meta/variants.yml index 4a869e7ade..8dec672b0a 100644 --- a/roles/web-app-discourse/meta/variants.yml +++ b/roles/web-app-discourse/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-discourse. # See docs/contributing/artefact/files/role/variants.md for the file format. # @@ -33,6 +32,9 @@ # variant 1: every dynamic flag off; postgres stays shared by design # (pinned in services.yml — see comment above). + css: + enabled: true + shared: true - services: asset: enabled: false @@ -55,3 +57,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-fediwall/meta/services.yml b/roles/web-app-fediwall/meta/services.yml index 6c12ddb15b..fd05a2e3fb 100644 --- a/roles/web-app-fediwall/meta/services.yml +++ b/roles/web-app-fediwall/meta/services.yml @@ -12,11 +12,10 @@ dashboard: matomo: enabled: true shared: true -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: email email: diff --git a/roles/web-app-fediwall/meta/variants.yml b/roles/web-app-fediwall/meta/variants.yml index 5e73f8e045..b2aaf87719 100644 --- a/roles/web-app-fediwall/meta/variants.yml +++ b/roles/web-app-fediwall/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. # # Variant 0 — defaults from meta/services.yml. Single wall, polls all @@ -37,6 +36,9 @@ # Variant 2 (false-pinning) — siblings opted out so the # variant-coverage matrix exercises the out-of-group_names branch # of every dynamic services flag. + css: + enabled: true + shared: true - services: mastodon: enabled: false @@ -45,6 +47,9 @@ enabled: false shared: false + css: + enabled: false + shared: false - services: mastodon: enabled: true @@ -56,50 +61,53 @@ # Variants replace lists wholesale (not deep-merged), so every # wall.config field is restated here — no template fallbacks. walls: - - slug: default - config: - servers: - - "{{ lookup('domain', 'web-app-mastodon') }}" - - "{{ lookup('domain', 'web-app-friendica') }}" - tags: [] - accounts: [] - loadPublic: true - loadFederated: false - loadTrends: false - languages: [] - badWords: [] - hideSensitive: true - hideBots: true - hideReplies: true - hideBoosts: false - limit: 20 - interval: 10 - title: Fediwall - theme: auto - showInfobar: true - showText: true - showMedia: true - playVideos: true - - slug: mastodon - config: - servers: - - "{{ lookup('domain', 'web-app-mastodon') }}" - tags: [] - accounts: [] - loadPublic: true - loadFederated: false - loadTrends: false - languages: [] - badWords: [] - hideSensitive: true - hideBots: true - hideReplies: true - hideBoosts: false - limit: 20 - interval: 10 - title: Mastodon - theme: auto - showInfobar: true - showText: true - showMedia: true - playVideos: true + - slug: default + config: + servers: + - "{{ lookup('domain', 'web-app-mastodon') }}" + - "{{ lookup('domain', 'web-app-friendica') }}" + tags: [] + accounts: [] + loadPublic: true + loadFederated: false + loadTrends: false + languages: [] + badWords: [] + hideSensitive: true + hideBots: true + hideReplies: true + hideBoosts: false + limit: 20 + interval: 10 + title: Fediwall + theme: auto + showInfobar: true + showText: true + showMedia: true + playVideos: true + - slug: mastodon + config: + servers: + - "{{ lookup('domain', 'web-app-mastodon') }}" + tags: [] + accounts: [] + loadPublic: true + loadFederated: false + loadTrends: false + languages: [] + badWords: [] + hideSensitive: true + hideBots: true + hideReplies: true + hideBoosts: false + limit: 20 + interval: 10 + title: Mastodon + theme: auto + showInfobar: true + showText: true + showMedia: true + playVideos: true + css: + enabled: false + shared: false diff --git a/roles/web-app-fider/meta/services.yml b/roles/web-app-fider/meta/services.yml index 8cf71912f0..a229f682b0 100644 --- a/roles/web-app-fider/meta/services.yml +++ b/roles/web-app-fider/meta/services.yml @@ -46,11 +46,10 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-fider/meta/variants.yml b/roles/web-app-fider/meta/variants.yml index 4ea9430050..167707f4da 100644 --- a/roles/web-app-fider/meta/variants.yml +++ b/roles/web-app-fider/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-fider. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-flowise/meta/services.yml b/roles/web-app-flowise/meta/services.yml index e9b89332e4..03ef92e8d5 100644 --- a/roles/web-app-flowise/meta/services.yml +++ b/roles/web-app-flowise/meta/services.yml @@ -71,11 +71,10 @@ redis: ollama: enabled: "{{ 'svc-ai-ollama' in group_names }}" shared: "{{ 'svc-ai-ollama' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-flowise/meta/variants.yml b/roles/web-app-flowise/meta/variants.yml index abf417bc59..e385742aa7 100644 --- a/roles/web-app-flowise/meta/variants.yml +++ b/roles/web-app-flowise/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Both auth-flow variants ride the same # `web-app-oauth2-proxy` sidecar in front of the Flowise web UI; # variant 0 is the canonical OIDC variant (Keycloak with local user @@ -33,6 +32,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -58,6 +60,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -65,3 +70,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-friendica/meta/services.yml b/roles/web-app-friendica/meta/services.yml index 668de4d93d..6d7ed0b8d1 100644 --- a/roles/web-app-friendica/meta/services.yml +++ b/roles/web-app-friendica/meta/services.yml @@ -53,7 +53,7 @@ oauth2: enabled: "{{ 'web-app-keycloak' in group_names }}" shared: "{{ 'web-app-keycloak' in group_names }}" # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-fusiondirectory/meta/services.yml b/roles/web-app-fusiondirectory/meta/services.yml index 40b38e2faf..2fdbe2e4b5 100644 --- a/roles/web-app-fusiondirectory/meta/services.yml +++ b/roles/web-app-fusiondirectory/meta/services.yml @@ -44,8 +44,7 @@ fusiondirectory: mem_reservation: 256m mem_limit: 1g pids_limit: 512 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" diff --git a/roles/web-app-fusiondirectory/meta/variants.yml b/roles/web-app-fusiondirectory/meta/variants.yml index 1fe0a2fd2d..9155ed3a4f 100644 --- a/roles/web-app-fusiondirectory/meta/variants.yml +++ b/roles/web-app-fusiondirectory/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides. `ldap` is pinned in `services.yml` # (`enabled: true`, `shared: true`) because LDAP IS the storage backend # for FusionDirectory — every variant inherits it, so the variant blocks @@ -26,6 +25,9 @@ shared: true # variant 1: Keycloak/federation surface off; LDAP-backed only. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -47,7 +49,13 @@ shared: false # variant 2: LDAP-only path explicitly disables oauth2. + css: + enabled: false + shared: false - services: oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-gitea/meta/services.yml b/roles/web-app-gitea/meta/services.yml index c0d97d6734..44665c9c69 100644 --- a/roles/web-app-gitea/meta/services.yml +++ b/roles/web-app-gitea/meta/services.yml @@ -69,11 +69,10 @@ oauth2: - /user/login enabled: "{{ 'web-app-keycloak' in group_names }}" shared: "{{ 'web-app-keycloak' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-gitea/meta/variants.yml b/roles/web-app-gitea/meta/variants.yml index 55642a0f24..b029978105 100644 --- a/roles/web-app-gitea/meta/variants.yml +++ b/roles/web-app-gitea/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-gitea. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -34,6 +33,9 @@ oidc: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -61,6 +63,9 @@ oidc: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -71,3 +76,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-gitlab/meta/services.yml b/roles/web-app-gitlab/meta/services.yml index 14e27ca555..a512353d5d 100644 --- a/roles/web-app-gitlab/meta/services.yml +++ b/roles/web-app-gitlab/meta/services.yml @@ -42,10 +42,9 @@ gitlab: - web-app-keycloak - web-app-mailu lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-gitlab/meta/variants.yml b/roles/web-app-gitlab/meta/variants.yml index a1606fad20..e8d8fe9654 100644 --- a/roles/web-app-gitlab/meta/variants.yml +++ b/roles/web-app-gitlab/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-gitlab. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-hugo/meta/services.yml b/roles/web-app-hugo/meta/services.yml index cb937258b1..78dc702a4e 100644 --- a/roles/web-app-hugo/meta/services.yml +++ b/roles/web-app-hugo/meta/services.yml @@ -20,11 +20,10 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" hugo: image: nginx version: 1.31-alpine diff --git a/roles/web-app-hugo/meta/variants.yml b/roles/web-app-hugo/meta/variants.yml index ada8f2cd1c..239acaeb35 100644 --- a/roles/web-app-hugo/meta/variants.yml +++ b/roles/web-app-hugo/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-hugo. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-jenkins/meta/services.yml b/roles/web-app-jenkins/meta/services.yml index 5704d538a7..3c26e043d7 100644 --- a/roles/web-app-jenkins/meta/services.yml +++ b/roles/web-app-jenkins/meta/services.yml @@ -33,8 +33,7 @@ jenkins: mem_reservation: 1g mem_limit: 2g pids_limit: 1024 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" diff --git a/roles/web-app-jenkins/meta/variants.yml b/roles/web-app-jenkins/meta/variants.yml index 4c5400489c..14ae884351 100644 --- a/roles/web-app-jenkins/meta/variants.yml +++ b/roles/web-app-jenkins/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides. Variant 0 is # the canonical OIDC variant (Jenkins's `oic-auth` plugin against # Keycloak). Variant 1 flips the role onto the `ldap` plugin against @@ -25,6 +24,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: oidc: enabled: false @@ -44,6 +46,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -51,3 +56,6 @@ oidc: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-jira/meta/services.yml b/roles/web-app-jira/meta/services.yml index 21836b03f6..8000e821a9 100644 --- a/roles/web-app-jira/meta/services.yml +++ b/roles/web-app-jira/meta/services.yml @@ -40,10 +40,9 @@ jira: - web-app-matomo - web-app-mailu lifecycle: unsupported -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-jira/meta/variants.yml b/roles/web-app-jira/meta/variants.yml index df77bf9dd9..1d41e54b56 100644 --- a/roles/web-app-jira/meta/variants.yml +++ b/roles/web-app-jira/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -46,3 +48,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-joomla/meta/services.yml b/roles/web-app-joomla/meta/services.yml index 6634e7b380..1466ce8c1f 100644 --- a/roles/web-app-joomla/meta/services.yml +++ b/roles/web-app-joomla/meta/services.yml @@ -50,11 +50,10 @@ joomla: mem_reservation: 256m mem_limit: 1g pids_limit: 512 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-joomla/meta/variants.yml b/roles/web-app-joomla/meta/variants.yml index 93fe39a9b6..a7fbdd1fb7 100644 --- a/roles/web-app-joomla/meta/variants.yml +++ b/roles/web-app-joomla/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Variant 0 is the canonical OIDC variant # (default), where Joomla speaks OIDC natively via the `plg_system_keycloak` # plugin shipped under `files/joomla-oidc-plugin/`. Variant 1 flips @@ -30,6 +29,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: oidc: enabled: false @@ -51,3 +53,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-keycloak/meta/services.yml b/roles/web-app-keycloak/meta/services.yml index 22c3bcae23..9ee0579816 100644 --- a/roles/web-app-keycloak/meta/services.yml +++ b/roles/web-app-keycloak/meta/services.yml @@ -59,11 +59,10 @@ keycloak: postgres: enabled: true # nocheck: dynamic-flag shared: "{{ 'svc-db-postgres' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — captcha backend, infrastructural recaptcha: diff --git a/roles/web-app-keycloak/meta/variants.yml b/roles/web-app-keycloak/meta/variants.yml index f652bb8f71..9f752f548c 100644 --- a/roles/web-app-keycloak/meta/variants.yml +++ b/roles/web-app-keycloak/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -29,6 +28,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - credentials: administrator_password: "'$tr0ng€xampl3PW!" services: @@ -52,3 +54,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-kix/meta/services.yml b/roles/web-app-kix/meta/services.yml index d49abe5543..02282993a5 100644 --- a/roles/web-app-kix/meta/services.yml +++ b/roles/web-app-kix/meta/services.yml @@ -24,7 +24,7 @@ oauth2: - "roles/web-app-kix/administrator" - "roles/web-app-kix/user" # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-lam/meta/services.yml b/roles/web-app-lam/meta/services.yml index 59489dc5a6..d33835b51e 100644 --- a/roles/web-app-lam/meta/services.yml +++ b/roles/web-app-lam/meta/services.yml @@ -34,10 +34,9 @@ oauth2: port: 80 allowed_groups: - "{{ lookup('rbac_group_path', application_id='web-app-lam', role='administrator') }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-lam/meta/variants.yml b/roles/web-app-lam/meta/variants.yml index 7c451bd4ae..07ceae7883 100644 --- a/roles/web-app-lam/meta/variants.yml +++ b/roles/web-app-lam/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. # See docs/contributing/artefact/files/role/variants.md for the file format. # @@ -28,6 +27,9 @@ shared: true # variant 1: Keycloak/federation surface off; LDAP-backed only. + css: + enabled: true + shared: true - credentials: administrator_password: "'$tr0ng€xampl3PW!" services: @@ -48,7 +50,13 @@ shared: false # variant 2: LDAP-only path explicitly disables oauth2. + css: + enabled: false + shared: false - services: oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-listmonk/meta/services.yml b/roles/web-app-listmonk/meta/services.yml index 8c63769267..0678775530 100644 --- a/roles/web-app-listmonk/meta/services.yml +++ b/roles/web-app-listmonk/meta/services.yml @@ -41,10 +41,9 @@ listmonk: - web-app-keycloak - web-app-mailu lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag hcaptcha: enabled: "{{ HCAPTCHA_ENABLED | bool }}" diff --git a/roles/web-app-listmonk/meta/variants.yml b/roles/web-app-listmonk/meta/variants.yml index 9660d58051..a2bb63c487 100644 --- a/roles/web-app-listmonk/meta/variants.yml +++ b/roles/web-app-listmonk/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-listmonk. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -31,6 +30,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: asset: enabled: false @@ -55,3 +57,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-littlejs/meta/services.yml b/roles/web-app-littlejs/meta/services.yml index f4ee0ae6c1..835b0c0669 100644 --- a/roles/web-app-littlejs/meta/services.yml +++ b/roles/web-app-littlejs/meta/services.yml @@ -20,10 +20,9 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag javascript: enabled: true diff --git a/roles/web-app-littlejs/meta/variants.yml b/roles/web-app-littlejs/meta/variants.yml index b255e04be6..d62cb67ae8 100644 --- a/roles/web-app-littlejs/meta/variants.yml +++ b/roles/web-app-littlejs/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-littlejs. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-magento/meta/services.yml b/roles/web-app-magento/meta/services.yml index 5a00993a8d..7b19161cd2 100644 --- a/roles/web-app-magento/meta/services.yml +++ b/roles/web-app-magento/meta/services.yml @@ -67,10 +67,9 @@ search: mem_reservation: 1g mem_limit: 2g pids_limit: 1024 -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-magento/meta/variants.yml b/roles/web-app-magento/meta/variants.yml index 3931e5f4a6..fc26ec13f8 100644 --- a/roles/web-app-magento/meta/variants.yml +++ b/roles/web-app-magento/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-magento. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -26,6 +25,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -45,3 +47,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-mailu/meta/services.yml b/roles/web-app-mailu/meta/services.yml index 29850afd53..0129eb95f8 100644 --- a/roles/web-app-mailu/meta/services.yml +++ b/roles/web-app-mailu/meta/services.yml @@ -153,7 +153,7 @@ front: mem_limit: 1g pids_limit: 512 # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-mastodon/meta/services.yml b/roles/web-app-mastodon/meta/services.yml index f5c6812734..e38ac1c87b 100644 --- a/roles/web-app-mastodon/meta/services.yml +++ b/roles/web-app-mastodon/meta/services.yml @@ -62,10 +62,9 @@ sidekiq: mem_reservation: 1g mem_limit: 1.5g pids_limit: 512 -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-mastodon/meta/variants.yml b/roles/web-app-mastodon/meta/variants.yml index 502aadad4f..eae45a079e 100644 --- a/roles/web-app-mastodon/meta/variants.yml +++ b/roles/web-app-mastodon/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-mastodon. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-matomo/meta/services.yml b/roles/web-app-matomo/meta/services.yml index 6f81f60625..964448fa00 100644 --- a/roles/web-app-matomo/meta/services.yml +++ b/roles/web-app-matomo/meta/services.yml @@ -62,7 +62,7 @@ redis: disabled: true enabled: false # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-matrix/meta/services.yml b/roles/web-app-matrix/meta/services.yml index 8be8f83ea3..2d4a0bec52 100644 --- a/roles/web-app-matrix/meta/services.yml +++ b/roles/web-app-matrix/meta/services.yml @@ -54,11 +54,10 @@ matrix-chatgpt-bot: mem_reservation: 128m mem_limit: 256m pids_limit: 256 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-matrix/meta/variants.yml b/roles/web-app-matrix/meta/variants.yml index b40a7c5adb..50b54a9baf 100644 --- a/roles/web-app-matrix/meta/variants.yml +++ b/roles/web-app-matrix/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-matrix. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-mattermost/meta/services.yml b/roles/web-app-mattermost/meta/services.yml index ac0c6abba5..6a2c0b104a 100644 --- a/roles/web-app-mattermost/meta/services.yml +++ b/roles/web-app-mattermost/meta/services.yml @@ -48,11 +48,10 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-mattermost/meta/variants.yml b/roles/web-app-mattermost/meta/variants.yml index 1a821699da..ddf3ea6a85 100644 --- a/roles/web-app-mattermost/meta/variants.yml +++ b/roles/web-app-mattermost/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-mattermost. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-mig/meta/services.yml b/roles/web-app-mig/meta/services.yml index 8f2ba3d572..1fdb7e8c34 100644 --- a/roles/web-app-mig/meta/services.yml +++ b/roles/web-app-mig/meta/services.yml @@ -40,11 +40,10 @@ mig: mem_reservation: 128m mem_limit: 256m pids_limit: 256 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-mig/meta/variants.yml b/roles/web-app-mig/meta/variants.yml index ffd8761e37..9a572a24b5 100644 --- a/roles/web-app-mig/meta/variants.yml +++ b/roles/web-app-mig/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-mig. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-mini-qr/meta/services.yml b/roles/web-app-mini-qr/meta/services.yml index 4a0ce67225..81c2b214a6 100644 --- a/roles/web-app-mini-qr/meta/services.yml +++ b/roles/web-app-mini-qr/meta/services.yml @@ -37,10 +37,9 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-mini-qr/meta/variants.yml b/roles/web-app-mini-qr/meta/variants.yml index 4ce13a4ed5..215b7449d7 100644 --- a/roles/web-app-mini-qr/meta/variants.yml +++ b/roles/web-app-mini-qr/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-mini-qr. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-minio/meta/services.yml b/roles/web-app-minio/meta/services.yml index dc7aa89afe..d7db976df3 100644 --- a/roles/web-app-minio/meta/services.yml +++ b/roles/web-app-minio/meta/services.yml @@ -35,11 +35,10 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-minio/meta/variants.yml b/roles/web-app-minio/meta/variants.yml index a266a524bf..5cc43b97e0 100644 --- a/roles/web-app-minio/meta/variants.yml +++ b/roles/web-app-minio/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Variant 0 is the canonical OIDC variant # (default). Variant 1 flips the role onto the LDAP variant so the # `oidc`/`ldap` Playwright variants both run end-to-end. @@ -28,6 +27,9 @@ ldap: enabled: true shared: true + css: + enabled: true + shared: true - services: oidc: enabled: false @@ -50,6 +52,9 @@ ldap: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -57,3 +62,6 @@ oidc: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-mobilizon/meta/services.yml b/roles/web-app-mobilizon/meta/services.yml index eb2830980b..7a399e7e4a 100644 --- a/roles/web-app-mobilizon/meta/services.yml +++ b/roles/web-app-mobilizon/meta/services.yml @@ -35,10 +35,9 @@ mobilizon: mem_reservation: 128m mem_limit: 256m pids_limit: 256 -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-mobilizon/meta/variants.yml b/roles/web-app-mobilizon/meta/variants.yml index aac2a9eecc..3d8e32ca5b 100644 --- a/roles/web-app-mobilizon/meta/variants.yml +++ b/roles/web-app-mobilizon/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-mobilizon. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-moodle/meta/services.yml b/roles/web-app-moodle/meta/services.yml index d719c7268c..837b584080 100644 --- a/roles/web-app-moodle/meta/services.yml +++ b/roles/web-app-moodle/meta/services.yml @@ -68,7 +68,7 @@ cron: mem_limit: 256m pids_limit: 256 # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-navigator/meta/services.yml b/roles/web-app-navigator/meta/services.yml index e8fb089e03..c135742ce0 100644 --- a/roles/web-app-navigator/meta/services.yml +++ b/roles/web-app-navigator/meta/services.yml @@ -20,10 +20,9 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-navigator/meta/variants.yml b/roles/web-app-navigator/meta/variants.yml index 9cc8340eff..0735df6ecf 100644 --- a/roles/web-app-navigator/meta/variants.yml +++ b/roles/web-app-navigator/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-navigator. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-nextcloud/meta/services.yml b/roles/web-app-nextcloud/meta/services.yml index 11c25b9189..0635e3e09a 100644 --- a/roles/web-app-nextcloud/meta/services.yml +++ b/roles/web-app-nextcloud/meta/services.yml @@ -252,7 +252,7 @@ talk_recording: pids_limit: 1024 min_storage: 1GB # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-oauth2-proxy/meta/services.yml b/roles/web-app-oauth2-proxy/meta/services.yml index 4e542171ca..419462b7ed 100644 --- a/roles/web-app-oauth2-proxy/meta/services.yml +++ b/roles/web-app-oauth2-proxy/meta/services.yml @@ -10,10 +10,9 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" oauth2-proxy: image: quay.io/oauth2-proxy/oauth2-proxy version: latest diff --git a/roles/web-app-oauth2-proxy/meta/variants.yml b/roles/web-app-oauth2-proxy/meta/variants.yml index a19b1b9de9..39f58dfdb8 100644 --- a/roles/web-app-oauth2-proxy/meta/variants.yml +++ b/roles/web-app-oauth2-proxy/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-oauth2-proxy. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: logout: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-odoo/meta/services.yml b/roles/web-app-odoo/meta/services.yml index c718516d58..dec4c5960c 100644 --- a/roles/web-app-odoo/meta/services.yml +++ b/roles/web-app-odoo/meta/services.yml @@ -62,7 +62,7 @@ redis: mem_limit: 512m pids_limit: 256 # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-opencloud/meta/services.yml b/roles/web-app-opencloud/meta/services.yml index b90ad7f09a..569bee366e 100644 --- a/roles/web-app-opencloud/meta/services.yml +++ b/roles/web-app-opencloud/meta/services.yml @@ -36,7 +36,7 @@ opencloud: - web-app-keycloak lifecycle: alpha # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-opentalk/meta/services.yml b/roles/web-app-opentalk/meta/services.yml index 34abf48707..c9d343db58 100644 --- a/roles/web-app-opentalk/meta/services.yml +++ b/roles/web-app-opentalk/meta/services.yml @@ -113,7 +113,7 @@ recorder: mem_limit: 2g pids_limit: 1024 # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-openwebui/meta/services.yml b/roles/web-app-openwebui/meta/services.yml index ed5c73f89c..698c4cdedf 100644 --- a/roles/web-app-openwebui/meta/services.yml +++ b/roles/web-app-openwebui/meta/services.yml @@ -41,7 +41,7 @@ redis: disabled: true enabled: false # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-peertube/meta/services.yml b/roles/web-app-peertube/meta/services.yml index 1d897d53f6..42d63527a5 100644 --- a/roles/web-app-peertube/meta/services.yml +++ b/roles/web-app-peertube/meta/services.yml @@ -47,7 +47,7 @@ peertube: - web-app-keycloak lifecycle: beta # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-pgadmin/meta/services.yml b/roles/web-app-pgadmin/meta/services.yml index a1777bc127..dc5c33ce5e 100644 --- a/roles/web-app-pgadmin/meta/services.yml +++ b/roles/web-app-pgadmin/meta/services.yml @@ -37,10 +37,9 @@ oauth2: port: "80" allowed_groups: - "{{ lookup('rbac_group_path', application_id='web-app-pgadmin', role='administrator') }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-pgadmin/meta/variants.yml b/roles/web-app-pgadmin/meta/variants.yml index 31699746c7..f3c2264fc4 100644 --- a/roles/web-app-pgadmin/meta/variants.yml +++ b/roles/web-app-pgadmin/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-pgadmin. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -25,6 +24,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -43,3 +45,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-phpldapadmin/meta/services.yml b/roles/web-app-phpldapadmin/meta/services.yml index 49e0e74b42..29e87f4fe0 100644 --- a/roles/web-app-phpldapadmin/meta/services.yml +++ b/roles/web-app-phpldapadmin/meta/services.yml @@ -35,10 +35,9 @@ oauth2: port: 8080 allowed_groups: - "{{ lookup('rbac_group_path', application_id='web-app-phpldapadmin', role='administrator') }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-phpldapadmin/meta/variants.yml b/roles/web-app-phpldapadmin/meta/variants.yml index 1e62f1c39c..dd0c494578 100644 --- a/roles/web-app-phpldapadmin/meta/variants.yml +++ b/roles/web-app-phpldapadmin/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-phpldapadmin. # See docs/contributing/artefact/files/role/variants.md for the file format. # @@ -26,6 +25,9 @@ shared: true # variant 1: Keycloak/federation surface off; LDAP-backed only. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -44,7 +46,13 @@ shared: false # variant 2: LDAP-only path explicitly disables oauth2. + css: + enabled: false + shared: false - services: oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-pixelfed/meta/services.yml b/roles/web-app-pixelfed/meta/services.yml index 1d93fa1e92..bef9e067ac 100644 --- a/roles/web-app-pixelfed/meta/services.yml +++ b/roles/web-app-pixelfed/meta/services.yml @@ -56,7 +56,7 @@ worker: pids_limit: 512 min_storage: 5GB # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-postmarks/meta/services.yml b/roles/web-app-postmarks/meta/services.yml index 056a21db14..7f7cec20e6 100644 --- a/roles/web-app-postmarks/meta/services.yml +++ b/roles/web-app-postmarks/meta/services.yml @@ -16,11 +16,10 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: email # nocheck: dynamic-flag email: diff --git a/roles/web-app-postmarks/meta/variants.yml b/roles/web-app-postmarks/meta/variants.yml index 430aaeb590..c433e36fb7 100644 --- a/roles/web-app-postmarks/meta/variants.yml +++ b/roles/web-app-postmarks/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for this role. Postmarks has no first-party OIDC or # LDAP integration, both auth-flow variants ride the same # `web-app-oauth2-proxy` sidecar in front of the Postmarks web UI. @@ -26,6 +25,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -42,3 +44,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-pretix/meta/services.yml b/roles/web-app-pretix/meta/services.yml index 8369483299..054e69470a 100644 --- a/roles/web-app-pretix/meta/services.yml +++ b/roles/web-app-pretix/meta/services.yml @@ -45,10 +45,9 @@ pretix: - web-app-keycloak - web-app-mailu lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-pretix/meta/variants.yml b/roles/web-app-pretix/meta/variants.yml index cf439b0858..268253e0e4 100644 --- a/roles/web-app-pretix/meta/variants.yml +++ b/roles/web-app-pretix/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-pretix. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-prometheus/meta/services.yml b/roles/web-app-prometheus/meta/services.yml index 443e6134ca..39387bf80c 100644 --- a/roles/web-app-prometheus/meta/services.yml +++ b/roles/web-app-prometheus/meta/services.yml @@ -22,11 +22,10 @@ matomo: email: enabled: "{{ 'web-app-mailu' in group_names }}" shared: "{{ 'web-app-mailu' in group_names }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag — gated on services.oauth2.enabled, not on group_names # nocheck: playwright-service-flag — runtime DOM patch, no probe-able surface flag javascript: diff --git a/roles/web-app-prometheus/meta/variants.yml b/roles/web-app-prometheus/meta/variants.yml index db4fe29601..c94044e417 100644 --- a/roles/web-app-prometheus/meta/variants.yml +++ b/roles/web-app-prometheus/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-prometheus. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -21,6 +20,9 @@ oauth2: enabled: true shared: true + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -37,3 +39,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-roulette-wheel/meta/services.yml b/roles/web-app-roulette-wheel/meta/services.yml index d34ebf69b3..debf78925f 100644 --- a/roles/web-app-roulette-wheel/meta/services.yml +++ b/roles/web-app-roulette-wheel/meta/services.yml @@ -20,10 +20,9 @@ dashboard: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" roulette-wheel: image: node version: latest diff --git a/roles/web-app-roulette-wheel/meta/variants.yml b/roles/web-app-roulette-wheel/meta/variants.yml index e90390ca75..101517862d 100644 --- a/roles/web-app-roulette-wheel/meta/variants.yml +++ b/roles/web-app-roulette-wheel/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-roulette-wheel. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-shopware/meta/services.yml b/roles/web-app-shopware/meta/services.yml index 6a1c8f612e..925492084e 100644 --- a/roles/web-app-shopware/meta/services.yml +++ b/roles/web-app-shopware/meta/services.yml @@ -124,10 +124,9 @@ opensearch: mem_limit: 4g min_storage: 10GB pids_limit: 1024 -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-shopware/meta/variants.yml b/roles/web-app-shopware/meta/variants.yml index 311bbeb6ba..ba4d5d3b4e 100644 --- a/roles/web-app-shopware/meta/variants.yml +++ b/roles/web-app-shopware/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-shopware. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -31,6 +30,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -58,6 +60,9 @@ # LDAP-only variant: ldap on, oauth2 off so the # Playwright spec exercises the LDAP-bind login path. + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -65,3 +70,6 @@ oauth2: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-sphinx/meta/services.yml b/roles/web-app-sphinx/meta/services.yml index ca0a7873f5..2e283b742a 100644 --- a/roles/web-app-sphinx/meta/services.yml +++ b/roles/web-app-sphinx/meta/services.yml @@ -38,11 +38,10 @@ sphinx: mem_reservation: 128m mem_limit: 256m pids_limit: 256 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: email # nocheck: dynamic-flag email: diff --git a/roles/web-app-sphinx/meta/variants.yml b/roles/web-app-sphinx/meta/variants.yml index 0dff40a991..ea9a6b4314 100644 --- a/roles/web-app-sphinx/meta/variants.yml +++ b/roles/web-app-sphinx/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-sphinx. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -17,6 +16,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -27,3 +29,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-taiga/meta/services.yml b/roles/web-app-taiga/meta/services.yml index 5775f61d13..4fb0f8e0ae 100644 --- a/roles/web-app-taiga/meta/services.yml +++ b/roles/web-app-taiga/meta/services.yml @@ -94,11 +94,10 @@ protected: mem_reservation: 128m mem_limit: 256m pids_limit: 128 -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider javascript: diff --git a/roles/web-app-taiga/meta/variants.yml b/roles/web-app-taiga/meta/variants.yml index 91d63d9a65..367bbd1556 100644 --- a/roles/web-app-taiga/meta/variants.yml +++ b/roles/web-app-taiga/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-taiga. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -31,6 +30,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -55,6 +57,9 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false - services: ldap: enabled: true @@ -62,3 +67,6 @@ oidc: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-wordpress/meta/services.yml b/roles/web-app-wordpress/meta/services.yml index 17ddf9cf4c..c1c3031ad5 100644 --- a/roles/web-app-wordpress/meta/services.yml +++ b/roles/web-app-wordpress/meta/services.yml @@ -47,7 +47,7 @@ wordpress: - web-app-keycloak lifecycle: beta # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: true diff --git a/roles/web-app-xwiki/meta/services.yml b/roles/web-app-xwiki/meta/services.yml index 9007351bab..9db111d44c 100644 --- a/roles/web-app-xwiki/meta/services.yml +++ b/roles/web-app-xwiki/meta/services.yml @@ -63,10 +63,9 @@ xwiki: - web-app-keycloak - web-app-mailu lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-app-xwiki/meta/variants.yml b/roles/web-app-xwiki/meta/variants.yml index 227f64a973..f3e4be3f9f 100644 --- a/roles/web-app-xwiki/meta/variants.yml +++ b/roles/web-app-xwiki/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-xwiki. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -28,6 +27,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -49,3 +51,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-app-yourls/meta/services.yml b/roles/web-app-yourls/meta/services.yml index 5c4560aa6d..7b9ca1e580 100644 --- a/roles/web-app-yourls/meta/services.yml +++ b/roles/web-app-yourls/meta/services.yml @@ -40,11 +40,10 @@ oauth2: acl: blacklist: - "{{ lookup('config', 'web-app-yourls', 'server.locations.admin') }}" -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: email # nocheck: dynamic-flag email: diff --git a/roles/web-app-yourls/meta/variants.yml b/roles/web-app-yourls/meta/variants.yml index 9be8ca4f5e..7ff5d08282 100644 --- a/roles/web-app-yourls/meta/variants.yml +++ b/roles/web-app-yourls/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-app-yourls. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -25,6 +24,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: dashboard: enabled: false @@ -43,3 +45,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-asset/tasks/01_core.yml b/roles/web-svc-asset/tasks/01_core.yml index 59fbd8a49f..82e07f2496 100644 --- a/roles/web-svc-asset/tasks/01_core.yml +++ b/roles/web-svc-asset/tasks/01_core.yml @@ -5,3 +5,11 @@ ansible.builtin.copy: src: "{{ source_directory }}" dest: "{{ target_directory }}" + +- name: "Redirect {{ lookup('domain', 'web-svc-asset') }} to web-svc-file" + include_role: + name: web-opt-rdr-domains + vars: + redirect_domain_mappings: + - source: "{{ lookup('domain', 'web-svc-asset') }}" + target: "{{ lookup('domain', 'web-svc-file') }}" diff --git a/roles/web-svc-cdn/meta/services.yml b/roles/web-svc-cdn/meta/services.yml index 26eaf233a0..fcb09d60a5 100644 --- a/roles/web-svc-cdn/meta/services.yml +++ b/roles/web-svc-cdn/meta/services.yml @@ -18,12 +18,6 @@ matomo: shared: "{{ 'web-app-matomo' in group_names }}" # nocheck: playwright-service-flag — canonical:cdn alias of self-provider # nocheck: dynamic-flag -css: - enabled: false - shared: true - canonical: cdn -# nocheck: playwright-service-flag — canonical:cdn alias of self-provider -# nocheck: dynamic-flag javascript: enabled: false shared: true diff --git a/roles/web-svc-coturn/meta/services.yml b/roles/web-svc-coturn/meta/services.yml index 811874d7ad..9ebe1a90ff 100644 --- a/roles/web-svc-coturn/meta/services.yml +++ b/roles/web-svc-coturn/meta/services.yml @@ -33,10 +33,9 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-svc-coturn/meta/variants.yml b/roles/web-svc-coturn/meta/variants.yml index 1214fa7abd..fb112d0f57 100644 --- a/roles/web-svc-coturn/meta/variants.yml +++ b/roles/web-svc-coturn/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-coturn. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -12,6 +11,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -19,3 +21,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-css/README.md b/roles/web-svc-css/README.md new file mode 100644 index 0000000000..f71b5b3fc2 --- /dev/null +++ b/roles/web-svc-css/README.md @@ -0,0 +1,30 @@ +# CSS Service + +## Description + +[CSS](https://developer.mozilla.org/en-US/docs/Web/CSS) styles the user-facing surfaces of web applications across the deployment. +This role registers `css` as a canonical service in the deployment's service registry so consumer roles can declare CSS as a runtime dependency. + +## Overview + +This role owns the `css` service flag and declares `web-svc-cdn` as the upstream that serves the actual CSS bytes. +Consumer roles gate CSS-dependent surfaces on `'web-svc-css' in group_names` via their own `meta/services.yml`. +The role's canonical domain 301-redirects to the CDN's canonical domain so health probes against the CSS hostname return a valid response. + +## Features + +- **Service flag ownership:** Owns the `css` entry in the central service registry. +- **CDN-backed delivery:** Declares `web-svc-cdn` as the upstream that serves the actual CSS bytes. +- **Health-probe friendly:** Redirects the canonical CSS hostname to the CDN so HTTP probes return a valid response. +- **Variant-matrix coverage:** Ships `meta/variants.yml` exercising both polarities of the `cdn` dependency. + +## Further Resources + +- [CSS on MDN](https://developer.mozilla.org/en-US/docs/Web/CSS) + +## Credits + +Developed and maintained by **Kevin Veen-Birkenbach**. +Learn more at [veen.world](https://www.veen.world). +Part of the [Infinito.Nexus Project](https://s.infinito.nexus/code). +Licensed under the [Infinito.Nexus Community License (Non-Commercial)](https://s.infinito.nexus/license). diff --git a/roles/web-svc-css/meta/main.yml b/roles/web-svc-css/meta/main.yml new file mode 100644 index 0000000000..2b8182b02a --- /dev/null +++ b/roles/web-svc-css/meta/main.yml @@ -0,0 +1,31 @@ +--- +galaxy_info: + author: Kevin Veen-Birchenbach + description: Canonical provider role for shared CSS assets. Owns the `css` service flag so consumer roles can gate their CSS-dependent surfaces on `'web-svc-css' in group_names`. + license: Infinito.Nexus Community License (Non-Commercial) + company: | + Kevin Veen-Birkenbach + https://www.veen.world + galaxy_tags: + - css + - assets + - nginx + - static + issue_tracker_url: https://s.infinito.nexus/issues + min_ansible_version: "2.9" + platforms: + - name: ArchLinux + versions: + - all + - name: Debian + versions: + - all + - name: EL + versions: + - all + - name: Fedora + versions: + - all + - name: Ubuntu + versions: + - all diff --git a/roles/web-svc-css/meta/server.yml b/roles/web-svc-css/meta/server.yml new file mode 100644 index 0000000000..abfa9e23f7 --- /dev/null +++ b/roles/web-svc-css/meta/server.yml @@ -0,0 +1,5 @@ +--- +domains: + canonical: + - css.{{ DOMAIN_PRIMARY }} + aliases: [] diff --git a/roles/web-svc-css/meta/services.yml b/roles/web-svc-css/meta/services.yml new file mode 100644 index 0000000000..f8eb07b1c3 --- /dev/null +++ b/roles/web-svc-css/meta/services.yml @@ -0,0 +1,14 @@ +--- +css: + enabled: true + shared: true + lifecycle: beta +cdn: + enabled: "{{ 'web-svc-cdn' in group_names }}" + shared: "{{ 'web-svc-cdn' in group_names }}" +matomo: + enabled: "{{ 'web-app-matomo' in group_names }}" + shared: "{{ 'web-app-matomo' in group_names }}" +prometheus: + enabled: "{{ 'web-app-prometheus' in group_names }}" + shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-svc-css/meta/variants.yml b/roles/web-svc-css/meta/variants.yml new file mode 100644 index 0000000000..cd2496cc0b --- /dev/null +++ b/roles/web-svc-css/meta/variants.yml @@ -0,0 +1,27 @@ +--- +# Matrix-deploy variant overrides for web-svc-css. +# See docs/contributing/artefact/files/role/variants.md for the file format. + +# variant pinning every dynamic services.yml flag to true so the +# matrix exercises the in-group_names branch of web-svc-css. + +- services: + cdn: + enabled: true + shared: true + matomo: + enabled: true + shared: true + prometheus: + enabled: true + shared: true +- services: + cdn: + enabled: false + shared: false + matomo: + enabled: false + shared: false + prometheus: + enabled: false + shared: false diff --git a/roles/web-svc-css/tasks/01_core.yml b/roles/web-svc-css/tasks/01_core.yml new file mode 100644 index 0000000000..b2fa4e973e --- /dev/null +++ b/roles/web-svc-css/tasks/01_core.yml @@ -0,0 +1,10 @@ +--- +- include_tasks: utils/once/flag.yml + +- name: "Redirect {{ lookup('domain', 'web-svc-css') }} to web-svc-cdn" + include_role: + name: web-opt-rdr-domains + vars: + redirect_domain_mappings: + - source: "{{ lookup('domain', 'web-svc-css') }}" + target: "{{ lookup('domain', 'web-svc-cdn') }}" diff --git a/roles/web-svc-css/tasks/main.yml b/roles/web-svc-css/tasks/main.yml new file mode 100644 index 0000000000..a7155177ba --- /dev/null +++ b/roles/web-svc-css/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- include_tasks: 01_core.yml + when: run_once_web_svc_css is not defined + vars: + application_id: "web-svc-css" diff --git a/roles/web-svc-css/vars/main.yml b/roles/web-svc-css/vars/main.yml new file mode 100644 index 0000000000..143b529532 --- /dev/null +++ b/roles/web-svc-css/vars/main.yml @@ -0,0 +1,2 @@ +--- +application_id: "web-svc-css" diff --git a/roles/web-svc-file/meta/services.yml b/roles/web-svc-file/meta/services.yml index ff53e5bbb3..0a3dff2311 100644 --- a/roles/web-svc-file/meta/services.yml +++ b/roles/web-svc-file/meta/services.yml @@ -10,10 +10,9 @@ file: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-svc-file/meta/variants.yml b/roles/web-svc-file/meta/variants.yml index 1a164f0c8f..f5c49b295d 100644 --- a/roles/web-svc-file/meta/variants.yml +++ b/roles/web-svc-file/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-file. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -12,6 +11,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -19,3 +21,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-html/meta/services.yml b/roles/web-svc-html/meta/services.yml index d6114288c7..911ae73dc4 100644 --- a/roles/web-svc-html/meta/services.yml +++ b/roles/web-svc-html/meta/services.yml @@ -2,10 +2,9 @@ matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-svc-html/meta/variants.yml b/roles/web-svc-html/meta/variants.yml index 6cd51670c1..8afb325041 100644 --- a/roles/web-svc-html/meta/variants.yml +++ b/roles/web-svc-html/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-html. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -14,6 +13,9 @@ # variant pinning every dynamic services.yml flag to false so the # matrix also exercises the out-of-group_names branch. + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -21,3 +23,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-libretranslate/meta/services.yml b/roles/web-svc-libretranslate/meta/services.yml index 875c9a9af3..8cf08acd4a 100644 --- a/roles/web-svc-libretranslate/meta/services.yml +++ b/roles/web-svc-libretranslate/meta/services.yml @@ -44,11 +44,10 @@ redis: backup: disabled: true enabled: false -# nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — captcha backend, infrastructural recaptcha: diff --git a/roles/web-svc-libretranslate/meta/variants.yml b/roles/web-svc-libretranslate/meta/variants.yml index 1ab7af0abb..bc67157c7a 100644 --- a/roles/web-svc-libretranslate/meta/variants.yml +++ b/roles/web-svc-libretranslate/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-libretranslate. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -15,6 +14,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -25,3 +27,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-logout/meta/services.yml b/roles/web-svc-logout/meta/services.yml index 45813d21cc..4f31113ad2 100644 --- a/roles/web-svc-logout/meta/services.yml +++ b/roles/web-svc-logout/meta/services.yml @@ -19,11 +19,10 @@ logout: matomo: enabled: "{{ 'web-app-matomo' in group_names }}" shared: "{{ 'web-app-matomo' in group_names }}" -# nocheck: dynamic-flag # nocheck: playwright-service-flag — web-svc-logout has no user-facing surface; CSS injection is asserted on the consuming role surfaces css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" # nocheck: dynamic-flag # nocheck: playwright-service-flag — web-svc-logout has no user-facing surface; JS injection is asserted on the consuming role surfaces javascript: diff --git a/roles/web-svc-logout/meta/variants.yml b/roles/web-svc-logout/meta/variants.yml index d44337700a..5fb96e11d2 100644 --- a/roles/web-svc-logout/meta/variants.yml +++ b/roles/web-svc-logout/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-logout. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -12,6 +11,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -19,3 +21,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-onlyoffice/meta/services.yml b/roles/web-svc-onlyoffice/meta/services.yml index 846d37a65c..236b91bfed 100644 --- a/roles/web-svc-onlyoffice/meta/services.yml +++ b/roles/web-svc-onlyoffice/meta/services.yml @@ -28,10 +28,9 @@ onlyoffice: local: http: 8061 lifecycle: beta -# nocheck: dynamic-flag css: - enabled: true - shared: true + enabled: "{{ 'web-svc-css' in group_names }}" + shared: "{{ 'web-svc-css' in group_names }}" prometheus: enabled: "{{ 'web-app-prometheus' in group_names }}" shared: "{{ 'web-app-prometheus' in group_names }}" diff --git a/roles/web-svc-onlyoffice/meta/variants.yml b/roles/web-svc-onlyoffice/meta/variants.yml index 6faad0dc86..91ff5e418f 100644 --- a/roles/web-svc-onlyoffice/meta/variants.yml +++ b/roles/web-svc-onlyoffice/meta/variants.yml @@ -1,4 +1,3 @@ ---- # Matrix-deploy variant overrides for web-svc-onlyoffice. # See docs/contributing/artefact/files/role/variants.md for the file format. @@ -14,6 +13,9 @@ prometheus: enabled: true shared: true + css: + enabled: true + shared: true - services: matomo: enabled: false @@ -23,3 +25,6 @@ prometheus: enabled: false shared: false + css: + enabled: false + shared: false diff --git a/roles/web-svc-simpleicons/meta/services.yml b/roles/web-svc-simpleicons/meta/services.yml index 2510b99412..5fd0b1c64d 100644 --- a/roles/web-svc-simpleicons/meta/services.yml +++ b/roles/web-svc-simpleicons/meta/services.yml @@ -17,7 +17,7 @@ redis: disabled: true enabled: false # nocheck: dynamic-flag -# nocheck: playwright-service-flag — canonical:cdn alias of static-asset provider +# nocheck: playwright-service-flag — css consumer, no Playwright surface (provider: web-svc-css) css: enabled: false shared: false diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml index 5bb4a30ed9..dd268ffc6d 100644 --- a/tasks/stages/01_constructor.yml +++ b/tasks/stages/01_constructor.yml @@ -67,14 +67,7 @@ # The following mapping is necessary to define the exceptions for domains which are created, but which aren't used CURRENT_PLAY_REDIRECT_DOMAINS: >- {{ - [] - | add_redirect_if_group( - 'web-svc-asset', - ([ lookup('domain','web-svc-asset') ] | flatten | map('string') | first), - ([ lookup('domain','web-svc-file') ] | flatten | map('string') | first), - group_names - ) - | merge_mapping(redirect_domain_mappings | default([]), 'source') + redirect_domain_mappings | default([]) | merge_mapping( [ { diff --git a/tests/unit/plugins/filter/test_redirect_filters.py b/tests/unit/plugins/filter/test_redirect_filters.py deleted file mode 100644 index 5f830d6d6f..0000000000 --- a/tests/unit/plugins/filter/test_redirect_filters.py +++ /dev/null @@ -1,54 +0,0 @@ -import sys -import unittest - -from . import PROJECT_ROOT - -if str(PROJECT_ROOT) not in sys.path: - sys.path.insert(0, str(PROJECT_ROOT)) - -from plugins.filter.redirect_filters import FilterModule - - -class TestAddRedirectIfGroup(unittest.TestCase): - """Unit-tests for the add_redirect_if_group filter.""" - - def setUp(self): - # Obtain the callable once for reuse - self.add_redirect = FilterModule().filters()["add_redirect_if_group"] - - def test_appends_redirect_when_group_present(self): - original = [{"source": "a", "target": "b"}] - result = self.add_redirect( - original, - group="lam", - source="ldap.example.com", - target="lam.example.com", - group_names=["lam", "other"], - ) - - # Original list must stay unchanged - self.assertEqual(len(original), 1) - # Result list must contain the extra entry - self.assertEqual(len(result), 2) - self.assertIn( - {"source": "ldap.example.com", "target": "lam.example.com"}, result - ) - - def test_keeps_list_unchanged_when_group_absent(self): - original = [{"source": "a", "target": "b"}] - result = self.add_redirect( - original, - group="lam", - source="ldap.example.com", - target="lam.example.com", - group_names=["unrelated"], - ) - - # No new entries - self.assertEqual(result, original) - # But ensure a new list object was returned (no in-place mutation) - self.assertIsNot(result, original) - - -if __name__ == "__main__": - unittest.main()