web: general domain cleanup (canonical/aliases normalization)

- Normalize domain blocks across apps:
  - Add explicit 'aliases: []' everywhere (no implicit aliases)
  - Standardize canonical subdomains for consistency:
    * Bluesky: web/api under *.bluesky.<PRIMARY_DOMAIN>
    * EspoCRM: espo.crm.<PRIMARY_DOMAIN>
    * Gitea:   tea.git.<PRIMARY_DOMAIN>
    * GitLab:  lab.git.<PRIMARY_DOMAIN>
    * Joomla:  joomla.cms.<PRIMARY_DOMAIN>
    * Magento: magento.shop.<PRIMARY_DOMAIN>
    * OpenProject: open.project.<PRIMARY_DOMAIN>
    * Pretix:  ticket.shop.<PRIMARY_DOMAIN>
    * Taiga:   kanban.project.<PRIMARY_DOMAIN>
  - Remove legacy/duplicate aliases and use empty list instead
  - Fix 'alias' -> 'aliases' where applicable

Context: preparing for AUTO_BUILD_ALIASES=False and deterministic redirect mapping.

Ref: conversation https://chatgpt.com/share/68cd512c-c878-800f-bdf2-81737adf7e0e
This commit is contained in:
2025-09-19 14:51:56 +02:00
parent 0f85d27a4d
commit 5e616d3962
53 changed files with 63 additions and 48 deletions

View File

@@ -13,6 +13,7 @@ server:
domains: domains:
canonical: canonical:
- "accounting.{{ PRIMARY_DOMAIN }}" - "accounting.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
flags: flags:
script-src-elem: script-src-elem:

View File

@@ -23,6 +23,7 @@ server:
domains: domains:
canonical: canonical:
- baserow.{{ PRIMARY_DOMAIN }} - baserow.{{ PRIMARY_DOMAIN }}
aliases: []
csp: csp:
whitelist: whitelist:
worker-src: worker-src:

View File

@@ -19,6 +19,7 @@ server:
domains: domains:
canonical: canonical:
- "meet.{{ PRIMARY_DOMAIN }}" - "meet.{{ PRIMARY_DOMAIN }}"
aliases: []
credentials: {} credentials: {}
docker: docker:

View File

@@ -9,9 +9,10 @@ server:
status_codes: status_codes:
web: 405 web: 405
domains: domains:
aliases: []
canonical: canonical:
web: "bskyweb.{{ PRIMARY_DOMAIN }}" web: "web.bluesky.{{ PRIMARY_DOMAIN }}"
api: "bluesky.{{ PRIMARY_DOMAIN }}" api: "api.bluesky.{{ PRIMARY_DOMAIN }}"
# view: "view.bluesky.{{ PRIMARY_DOMAIN }}" # view: "view.bluesky.{{ PRIMARY_DOMAIN }}"
csp: csp:
whitelist: whitelist:

View File

@@ -10,6 +10,7 @@ server:
domains: domains:
canonical: canonical:
- "bridgyfed.{{ PRIMARY_DOMAIN }}" - "bridgyfed.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
whitelist: {} whitelist: {}
flags: {} flags: {}

View File

@@ -30,9 +30,7 @@ server:
domains: domains:
canonical: canonical:
- "c.wiki.{{ PRIMARY_DOMAIN }}" - "c.wiki.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "confluence.{{ PRIMARY_DOMAIN }}"
- "confluence.wiki.{{ PRIMARY_DOMAIN }}"
rbac: rbac:
roles: {} roles: {}
truststore_enabled: false truststore_enabled: false

View File

@@ -20,6 +20,7 @@ server:
domains: domains:
canonical: canonical:
- "forum.{{ PRIMARY_DOMAIN }}" - "forum.{{ PRIMARY_DOMAIN }}"
aliases: []
docker: docker:
services: services:
database: database:

View File

@@ -4,3 +4,4 @@ server:
domains: domains:
canonical: canonical:
- elk.{{ PRIMARY_DOMAIN }} - elk.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -23,10 +23,9 @@ server:
frame-src: frame-src:
- https://s.espocrm.com/ - https://s.espocrm.com/
domains: domains:
aliases: aliases: []
- "crm.{{ PRIMARY_DOMAIN }}"
canonical: canonical:
- espocrm.{{ PRIMARY_DOMAIN }} - espo.crm.{{ PRIMARY_DOMAIN }}
email: email:
from_name: "Customer Relationship Management ({{ PRIMARY_DOMAIN }})" from_name: "Customer Relationship Management ({{ PRIMARY_DOMAIN }})"
docker: docker:

View File

@@ -13,6 +13,7 @@ server:
domains: domains:
canonical: canonical:
- "social.{{ PRIMARY_DOMAIN }}" - "social.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
flags: flags:
script-src-elem: script-src-elem:

View File

@@ -24,9 +24,7 @@ server:
domains: domains:
canonical: canonical:
- "audio.{{ PRIMARY_DOMAIN }}" - "audio.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "music.{{ PRIMARY_DOMAIN }}"
- "sound.{{ PRIMARY_DOMAIN }}"
csp: csp:
flags: flags:
style-src: style-src:

View File

@@ -35,10 +35,9 @@ server:
manifest-src: manifest-src:
- "data:" - "data:"
domains: domains:
aliases: aliases: []
- "git.{{ PRIMARY_DOMAIN }}"
canonical: canonical:
- gitea.{{ PRIMARY_DOMAIN }} - tea.git.{{ PRIMARY_DOMAIN }}
docker: docker:
services: services:
database: database:

View File

@@ -22,4 +22,4 @@ docker:
server: server:
domains: domains:
canonical: canonical:
- gitlab.{{ PRIMARY_DOMAIN }} - lab.git.{{ PRIMARY_DOMAIN }}

View File

@@ -4,3 +4,4 @@ server:
domains: domains:
canonical: canonical:
- jenkins.{{ PRIMARY_DOMAIN }} - jenkins.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -31,6 +31,7 @@ server:
domains: domains:
canonical: canonical:
- "jira.{{ PRIMARY_DOMAIN }}" - "jira.{{ PRIMARY_DOMAIN }}"
aliases: []
status_codes: status_codes:
default: 405 default: 405
rbac: rbac:

View File

@@ -10,7 +10,8 @@ features:
server: server:
domains: domains:
canonical: canonical:
- "cms.{{ PRIMARY_DOMAIN }}" - "joomla.cms.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
flags: flags:
style-src: style-src:

View File

@@ -29,6 +29,7 @@ server:
domains: domains:
canonical: canonical:
- "auth.{{ PRIMARY_DOMAIN }}" - "auth.{{ PRIMARY_DOMAIN }}"
aliases: []
scopes: scopes:
nextcloud: nextcloud nextcloud: nextcloud

View File

@@ -26,8 +26,7 @@ server:
script-src: script-src:
unsafe-inline: true unsafe-inline: true
domains: domains:
aliases: aliases: []
- "ldap.{{ PRIMARY_DOMAIN }}"
canonical: canonical:
- lam.{{ PRIMARY_DOMAIN }} - lam.{{ PRIMARY_DOMAIN }}

View File

@@ -10,6 +10,7 @@ server:
domains: domains:
canonical: canonical:
- "newsletter.{{ PRIMARY_DOMAIN }}" - "newsletter.{{ PRIMARY_DOMAIN }}"
aliases: []
status_codes: status_codes:
default: 404 default: 404
docker: docker:

View File

@@ -12,9 +12,8 @@ server:
whitelist: {} whitelist: {}
domains: domains:
canonical: canonical:
- "shop.{{ PRIMARY_DOMAIN }}" - "magento.shop.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "magento.{{ PRIMARY_DOMAIN }}"
docker: docker:
services: services:
php: php:

View File

@@ -13,8 +13,7 @@ server:
domains: domains:
canonical: canonical:
- "{{ SYSTEM_EMAIL.HOST }}" - "{{ SYSTEM_EMAIL.HOST }}"
alias: aliases: []
- "mailu.{{ PRIMARY_DOMAIN }}"
csp: csp:
flags: flags:
style-src: style-src:

View File

@@ -10,6 +10,7 @@ server:
domains: domains:
canonical: canonical:
- "microblog.{{ PRIMARY_DOMAIN }}" - "microblog.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
whitelist: whitelist:
frame-src: frame-src:

View File

@@ -26,10 +26,9 @@ server:
unsafe-inline: true unsafe-inline: true
unsafe-eval: true unsafe-eval: true
domains: domains:
aliases:
- "analytics.{{ PRIMARY_DOMAIN }}"
canonical: canonical:
- "matomo.{{ PRIMARY_DOMAIN }}" - "matomo.{{ PRIMARY_DOMAIN }}"
aliases: []
excluded_ips: "{{ networks.internet.values() | list }}" excluded_ips: "{{ networks.internet.values() | list }}"
docker: docker:

View File

@@ -3,8 +3,7 @@ server:
domains: domains:
canonical: canonical:
- "m.wiki.{{ PRIMARY_DOMAIN }}" - "m.wiki.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "media.wiki.{{ PRIMARY_DOMAIN }}"
docker: docker:
services: services:
database: database:

View File

@@ -34,8 +34,7 @@ server:
domains: domains:
canonical: canonical:
- "mig.{{ PRIMARY_DOMAIN }}" - "mig.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "meta-infinite-graph.{{ PRIMARY_DOMAIN }}"
build_data: build_data:
# This shouldn't be relevant anymore, because the data is anyhow build async in background # This shouldn't be relevant anymore, because the data is anyhow build async in background

View File

@@ -15,8 +15,8 @@ server:
domains: domains:
canonical: canonical:
- "event.{{ PRIMARY_DOMAIN }}" - "event.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "events.{{ PRIMARY_DOMAIN }}"
docker: docker:
services: services:
database: database:

View File

@@ -26,6 +26,7 @@ server:
domains: domains:
canonical: canonical:
- "academy.{{ PRIMARY_DOMAIN }}" - "academy.{{ PRIMARY_DOMAIN }}"
aliases: []
docker: docker:
services: services:
database: database:

View File

@@ -27,3 +27,4 @@ server:
domains: domains:
canonical: canonical:
- "slides.{{ PRIMARY_DOMAIN }}" - "slides.{{ PRIMARY_DOMAIN }}"
aliases: []

View File

@@ -18,6 +18,7 @@ server:
domains: domains:
canonical: canonical:
- "cloud.{{ PRIMARY_DOMAIN }}" - "cloud.{{ PRIMARY_DOMAIN }}"
aliases: []
docker: docker:
volumes: volumes:
data: nextcloud_data data: nextcloud_data

View File

@@ -10,3 +10,4 @@ server:
domains: domains:
canonical: canonical:
- oauth2-proxy.{{ PRIMARY_DOMAIN }} - oauth2-proxy.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -30,8 +30,8 @@ server:
- "data:" - "data:"
domains: domains:
canonical: canonical:
- "project.{{ PRIMARY_DOMAIN }}" - "open.project.{{ PRIMARY_DOMAIN }}"
aliases: []
docker: docker:
services: services:
database: database:

View File

@@ -24,8 +24,8 @@ server:
domains: domains:
canonical: canonical:
- "video.{{ PRIMARY_DOMAIN }}" - "video.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "videos.{{ PRIMARY_DOMAIN }}"
docker: docker:
services: services:
redis: redis:

View File

@@ -26,6 +26,7 @@ server:
domains: domains:
canonical: canonical:
- pgadmin.{{ PRIMARY_DOMAIN }} - pgadmin.{{ PRIMARY_DOMAIN }}
aliases: []
docker: docker:
services: services:
database: database:

View File

@@ -15,3 +15,4 @@ server:
domains: domains:
canonical: canonical:
- phpldapadmin.{{ PRIMARY_DOMAIN }} - phpldapadmin.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -20,9 +20,7 @@ server:
script-src-elem: script-src-elem:
unsafe-inline: true unsafe-inline: true
domains: domains:
aliases: aliases: []
- "mysql.{{ PRIMARY_DOMAIN }}"
- "mariadb.{{ PRIMARY_DOMAIN }}"
canonical: canonical:
- phpmyadmin.{{ PRIMARY_DOMAIN }} - phpmyadmin.{{ PRIMARY_DOMAIN }}
docker: docker:

View File

@@ -23,8 +23,7 @@ server:
domains: domains:
canonical: canonical:
- "picture.{{ PRIMARY_DOMAIN }}" - "picture.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "pictures.{{ PRIMARY_DOMAIN }}"
docker: docker:
services: services:
redis: redis:

View File

@@ -27,9 +27,8 @@ server:
flags: {} flags: {}
domains: domains:
canonical: canonical:
- "ticket.{{ PRIMARY_DOMAIN }}" - "ticket.shop.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "pretix.{{ PRIMARY_DOMAIN }}"
rbac: rbac:
roles: {} roles: {}
plugins: plugins:

View File

@@ -4,3 +4,4 @@ server:
domains: domains:
canonical: canonical:
- "wheel.{{ PRIMARY_DOMAIN }}" - "wheel.{{ PRIMARY_DOMAIN }}"
aliases: []

View File

@@ -10,6 +10,7 @@ server:
domains: domains:
canonical: canonical:
- "inventory.{{ PRIMARY_DOMAIN }}" - "inventory.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
flags: flags:
script-src: script-src:

View File

@@ -16,3 +16,4 @@ server:
domains: domains:
canonical: canonical:
- "docs.{{ PRIMARY_DOMAIN }}" - "docs.{{ PRIMARY_DOMAIN }}"
aliases: []

View File

@@ -17,3 +17,4 @@ server:
domains: domains:
canonical: canonical:
- syncope.{{ PRIMARY_DOMAIN }} - syncope.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -31,4 +31,4 @@ server:
unsafe-eval: true unsafe-eval: true
domains: domains:
canonical: canonical:
- "kanban.{{ PRIMARY_DOMAIN }}" - "kanban.project.{{ PRIMARY_DOMAIN }}"

View File

@@ -41,6 +41,7 @@ server:
domains: domains:
canonical: canonical:
- "blog.{{ PRIMARY_DOMAIN }}" - "blog.{{ PRIMARY_DOMAIN }}"
aliases: []
docker: docker:
services: services:
database: database:

View File

@@ -35,6 +35,7 @@ server:
domains: domains:
canonical: canonical:
- "x.wiki.{{ PRIMARY_DOMAIN }}" - "x.wiki.{{ PRIMARY_DOMAIN }}"
aliases: []
rbac: rbac:
roles: {} roles: {}
ldap: ldap:

View File

@@ -17,8 +17,7 @@ server:
domains: domains:
canonical: canonical:
- "s.{{ PRIMARY_DOMAIN }}" - "s.{{ PRIMARY_DOMAIN }}"
aliases: aliases: []
- "short.{{ PRIMARY_DOMAIN }}"
csp: csp:
flags: flags:
style-src: style-src:

View File

@@ -4,3 +4,4 @@ server:
domains: domains:
canonical: canonical:
- asset.{{ PRIMARY_DOMAIN }} - asset.{{ PRIMARY_DOMAIN }}
aliases: []

View File

@@ -6,3 +6,4 @@ server:
domains: domains:
canonical: canonical:
- "cdn.{{ PRIMARY_DOMAIN }}" - "cdn.{{ PRIMARY_DOMAIN }}"
aliases: []

View File

@@ -2,6 +2,7 @@ server:
domains: domains:
canonical: canonical:
- "collabora.{{ PRIMARY_DOMAIN }}" - "collabora.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
whitelist: whitelist:
frame-ancestors: frame-ancestors:

View File

@@ -6,5 +6,4 @@ server:
domains: domains:
canonical: canonical:
- "file.{{ PRIMARY_DOMAIN }}" - "file.{{ PRIMARY_DOMAIN }}"
alias: aliases: []
- "files.{{ PRIMARY_DOMAIN }}"

View File

@@ -6,3 +6,4 @@ server:
domains: domains:
canonical: canonical:
- "html.{{ PRIMARY_DOMAIN }}" - "html.{{ PRIMARY_DOMAIN }}"
aliases: []

View File

@@ -8,6 +8,7 @@ server:
domains: domains:
canonical: canonical:
- "logout.{{ PRIMARY_DOMAIN }}" - "logout.{{ PRIMARY_DOMAIN }}"
aliases: []
csp: csp:
flags: flags:
style-src: style-src:

View File

@@ -21,6 +21,7 @@ server:
domains: domains:
canonical: canonical:
- "icons.{{ PRIMARY_DOMAIN }}" - "icons.{{ PRIMARY_DOMAIN }}"
aliases: []
rbac: rbac:
roles: roles:
mail-bot: mail-bot:

View File

@@ -5,3 +5,4 @@ server:
domains: domains:
canonical: canonical:
- xmpp.{{ PRIMARY_DOMAIN }} - xmpp.{{ PRIMARY_DOMAIN }}
aliases: []