From bba663f95dd62eb3607799da2584c04a5957a0b6 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 22 Jul 2025 19:20:29 +0200 Subject: [PATCH] Added missing canonicals --- roles/web-app-baserow/config/main.yml | 4 ++++ roles/web-app-elk/config/main.yml | 4 ++++ roles/web-app-espocrm/config/main.yml | 2 ++ roles/web-app-gitea/config/main.yml | 2 ++ roles/web-app-gitlab/config/main.yml | 4 ++++ roles/web-app-jenkins/config/main.yml | 4 ++++ roles/web-app-lam/config/main.yml | 2 ++ roles/web-app-mybb/config/main.yml | 4 ++++ roles/web-app-oauth2-proxy/config/main.yml | 4 ++++ roles/web-app-pgadmin/config/main.yml | 4 ++++ roles/web-app-phpldapadmin/config/main.yml | 4 ++++ roles/web-app-phpmyadmin/config/main.yml | 2 ++ roles/web-app-syncope/config/main.yml | 4 ++++ roles/web-app-xmpp/config/main.yml | 4 ++++ roles/web-svc-asset/config/main.yml | 6 +++++- 15 files changed, 53 insertions(+), 1 deletion(-) diff --git a/roles/web-app-baserow/config/main.yml b/roles/web-app-baserow/config/main.yml index 774aa080..e033f79a 100644 --- a/roles/web-app-baserow/config/main.yml +++ b/roles/web-app-baserow/config/main.yml @@ -18,3 +18,7 @@ docker: name: "baserow" volumes: data: "baserow_data" + +domains: + canonical: + - baserow.{{ primary_domain }} diff --git a/roles/web-app-elk/config/main.yml b/roles/web-app-elk/config/main.yml index d3bcee2a..08b1b4cf 100644 --- a/roles/web-app-elk/config/main.yml +++ b/roles/web-app-elk/config/main.yml @@ -1,2 +1,6 @@ features: universal_logout: false # Just deactivated to oppress warnings, elk is anyhow not running + +domains: + canonical: + - elk.{{ primary_domain }} diff --git a/roles/web-app-espocrm/config/main.yml b/roles/web-app-espocrm/config/main.yml index 5d6d6140..f437b8cc 100644 --- a/roles/web-app-espocrm/config/main.yml +++ b/roles/web-app-espocrm/config/main.yml @@ -24,6 +24,8 @@ csp: domains: aliases: - "crm.{{ primary_domain }}" + canonical: + - espocrm.{{ primary_domain }} email: from_name: "Customer Relationship Management ({{ primary_domain }})" docker: diff --git a/roles/web-app-gitea/config/main.yml b/roles/web-app-gitea/config/main.yml index 44ba42d5..d80178e6 100644 --- a/roles/web-app-gitea/config/main.yml +++ b/roles/web-app-gitea/config/main.yml @@ -36,6 +36,8 @@ csp: domains: aliases: - "git.{{ primary_domain }}" + canonical: + - gitea.{{ primary_domain }} docker: services: database: diff --git a/roles/web-app-gitlab/config/main.yml b/roles/web-app-gitlab/config/main.yml index 55a4db03..0a4e4233 100644 --- a/roles/web-app-gitlab/config/main.yml +++ b/roles/web-app-gitlab/config/main.yml @@ -15,3 +15,7 @@ docker: version: "latest" credentials: initial_root_password: "{{ users.administrator.password }}" + +domains: + canonical: + - gitlab.{{ primary_domain }} diff --git a/roles/web-app-jenkins/config/main.yml b/roles/web-app-jenkins/config/main.yml index 5827a713..b440f1e4 100644 --- a/roles/web-app-jenkins/config/main.yml +++ b/roles/web-app-jenkins/config/main.yml @@ -1,2 +1,6 @@ features: universal_logout: true # Same like with elk, anyhow not active atm + +domains: + canonical: + - jenkins.{{ primary_domain }} diff --git a/roles/web-app-lam/config/main.yml b/roles/web-app-lam/config/main.yml index e6bb7240..70e1895f 100644 --- a/roles/web-app-lam/config/main.yml +++ b/roles/web-app-lam/config/main.yml @@ -25,4 +25,6 @@ csp: domains: aliases: - "ldap.{{primary_domain}}" + canonical: + - lam.{{ primary_domain }} diff --git a/roles/web-app-mybb/config/main.yml b/roles/web-app-mybb/config/main.yml index 0ea0bbd2..c1d1af3a 100644 --- a/roles/web-app-mybb/config/main.yml +++ b/roles/web-app-mybb/config/main.yml @@ -15,3 +15,7 @@ docker: name: "mybb" volumes: data: "mybb_data" + +domains: + canonical: + - mybb.{{ primary_domain }} diff --git a/roles/web-app-oauth2-proxy/config/main.yml b/roles/web-app-oauth2-proxy/config/main.yml index 6d3206f8..d69388d1 100644 --- a/roles/web-app-oauth2-proxy/config/main.yml +++ b/roles/web-app-oauth2-proxy/config/main.yml @@ -6,3 +6,7 @@ features: css: true port-ui-desktop: false universal_logout: true + +domains: + canonical: + - oauth2-proxy.{{ primary_domain }} diff --git a/roles/web-app-pgadmin/config/main.yml b/roles/web-app-pgadmin/config/main.yml index b4db551b..2ac05869 100644 --- a/roles/web-app-pgadmin/config/main.yml +++ b/roles/web-app-pgadmin/config/main.yml @@ -26,3 +26,7 @@ docker: services: database: enabled: true + +domains: + canonical: + - pgadmin.{{ primary_domain }} diff --git a/roles/web-app-phpldapadmin/config/main.yml b/roles/web-app-phpldapadmin/config/main.yml index 148eba50..77f88cef 100644 --- a/roles/web-app-phpldapadmin/config/main.yml +++ b/roles/web-app-phpldapadmin/config/main.yml @@ -11,3 +11,7 @@ features: ldap: true oauth2: true universal_logout: true + +domains: + canonical: + - phpldapadmin.{{ primary_domain }} diff --git a/roles/web-app-phpmyadmin/config/main.yml b/roles/web-app-phpmyadmin/config/main.yml index 3257e918..9e2dfc28 100644 --- a/roles/web-app-phpmyadmin/config/main.yml +++ b/roles/web-app-phpmyadmin/config/main.yml @@ -22,6 +22,8 @@ domains: aliases: - "mysql.{{ primary_domain }}" - "mariadb.{{ primary_domain }}" + canonical: + - phpmyadmin.{{ primary_domain }} docker: services: database: diff --git a/roles/web-app-syncope/config/main.yml b/roles/web-app-syncope/config/main.yml index 7c79d680..3e04b9b5 100644 --- a/roles/web-app-syncope/config/main.yml +++ b/roles/web-app-syncope/config/main.yml @@ -13,3 +13,7 @@ features: # users: # administrator: # username: "{{ users.administrator.username }}" + +domains: + canonical: + - syncope.{{ primary_domain }} diff --git a/roles/web-app-xmpp/config/main.yml b/roles/web-app-xmpp/config/main.yml index 83751c72..a435f55b 100644 --- a/roles/web-app-xmpp/config/main.yml +++ b/roles/web-app-xmpp/config/main.yml @@ -1,3 +1,7 @@ # xmpp is more a service then a app with ui interface. @todo Rename it features: universal_logout: false # Reactivated as soon as xmpp is fully implemented + +domains: + canonical: + - xmpp.{{ primary_domain }} diff --git a/roles/web-svc-asset/config/main.yml b/roles/web-svc-asset/config/main.yml index 8798c9b3..43f6e184 100644 --- a/roles/web-svc-asset/config/main.yml +++ b/roles/web-svc-asset/config/main.yml @@ -1,2 +1,6 @@ source_directory: "{{ playbook_dir }}/assets" -url: "{{ web_protocol }}://<< defaults_applications['web-svc-file']domains.canonical[0] >>/assets" \ No newline at end of file +url: "{{ web_protocol }}://<< defaults_applications['web-svc-file']domains.canonical[0] >>/assets" + +domains: + canonical: + - asset.{{ primary_domain }}