From 41cd6b770299fdf39015204c94150fd6595fc077 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 13 Aug 2025 23:33:49 +0200 Subject: [PATCH] Replaced get_domain with get_url --- roles/web-app-espocrm/tasks/01_patch_config.yml | 2 +- roles/web-app-espocrm/templates/env.j2 | 4 ++-- roles/web-app-espocrm/vars/main.yml | 5 +++-- .../web-app-port-ui/templates/menu/applications.yml.j2 | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/roles/web-app-espocrm/tasks/01_patch_config.yml b/roles/web-app-espocrm/tasks/01_patch_config.yml index 215f8a7b..14973fc8 100644 --- a/roles/web-app-espocrm/tasks/01_patch_config.yml +++ b/roles/web-app-espocrm/tasks/01_patch_config.yml @@ -30,7 +30,7 @@ $c = $app->getContainer(); $cfg = $c->get("config"); $writer = $c->get("injectableFactory")->create("\Espo\Core\Utils\Config\ConfigWriter"); - $new = "{{ domains | get_url(application_id, WEB_PROTOCOL) }}"; + $new = "{{ espocrm_url }}"; if ($cfg->get("siteUrl") !== $new) { $writer->set("siteUrl", $new); $writer->save(); diff --git a/roles/web-app-espocrm/templates/env.j2 b/roles/web-app-espocrm/templates/env.j2 index 28eb811e..2c8c417d 100644 --- a/roles/web-app-espocrm/templates/env.j2 +++ b/roles/web-app-espocrm/templates/env.j2 @@ -23,7 +23,7 @@ ESPOCRM_ADMIN_USERNAME={{ applications | get_app_conf(application_id, 'users.adm ESPOCRM_ADMIN_PASSWORD={{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }} # Public base URL of the EspoCRM instance -ESPOCRM_SITE_URL={{ domains | get_url(application_id, WEB_PROTOCOL) }} +ESPOCRM_SITE_URL={{ espocrm_url }} # ------------------------------------------------ # General UI & locale settings @@ -94,7 +94,7 @@ ESPOCRM_CONFIG_OIDC_TOKEN_ENDPOINT={{ oidc.client.token_url }} ESPOCRM_CONFIG_OIDC_USER_INFO_ENDPOINT={{ oidc.client.user_info_url }} ESPOCRM_CONFIG_OIDC_JWKS_ENDPOINT={{ oidc.client.certs }} -ESPOCRM_CONFIG_OIDC_AUTHORIZATION_REDIRECT_URI=https://{{ domains | get_domain(application_id) }}/oidc/callback +ESPOCRM_CONFIG_OIDC_AUTHORIZATION_REDIRECT_URI={{ espocrm_url }}/oidc/callback #ESPOCRM_CONFIG_OIDC_SCOPES=openid,profile,email # Defined in main.yml ESPOCRM_CONFIG_OIDC_CREATE_USER=true diff --git a/roles/web-app-espocrm/vars/main.yml b/roles/web-app-espocrm/vars/main.yml index 8e09f585..498aec41 100644 --- a/roles/web-app-espocrm/vars/main.yml +++ b/roles/web-app-espocrm/vars/main.yml @@ -5,7 +5,7 @@ application_id: "web-app-espocrm" database_type: "mariadb" # Webserver -location_ws: "/ws" +location_ws: "/ws" ws_port: "{{ ports.localhost.websocket[application_id] }}" client_max_body_size: "100m" vhost_flavour: "ws_generic" @@ -15,4 +15,5 @@ espocrm_version: "{{ applications | get_app_conf(application_id, espocrm_image: "{{ applications | get_app_conf(application_id, 'docker.services.espocrm.image', True) }}" espocrm_name: "{{ applications | get_app_conf(application_id, 'docker.services.espocrm.name', True) }}" espocrm_volume: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}" -espocrm_config_file: "/var/www/html/data/config-internal.php" \ No newline at end of file +espocrm_config_file: "/var/www/html/data/config-internal.php" +espocrm_url: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}" \ No newline at end of file diff --git a/roles/web-app-port-ui/templates/menu/applications.yml.j2 b/roles/web-app-port-ui/templates/menu/applications.yml.j2 index 7739588e..a9aac40f 100644 --- a/roles/web-app-port-ui/templates/menu/applications.yml.j2 +++ b/roles/web-app-port-ui/templates/menu/applications.yml.j2 @@ -24,27 +24,27 @@ applications: icon: {{ app.icon }} url: {{ app.url }} iframe: {{ app.iframe }} - {% if app.title == 'Keycloak' %} - + {% set keycloak_url = domains | get_url(application_id, WEB_PROTOCOL) %} + {{ domains | get_url(application_id, WEB_PROTOCOL) }} children: - name: Administration description: Access the central admin console icon: class: fa-solid fa-shield-halved - url: https://{{domains | get_domain('web-app-keycloak')}}/admin + url: {{ keycloak_url }}/admin iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }} - name: Profile description: Update your personal admin settings icon: class: fa-solid fa-user-gear - url: https://{{ domains | get_domain('web-app-keycloak') }}/realms/{{oidc.client.id}}/account + url: {{ keycloak_url }}/realms/{{oidc.client.id}}/account iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }} - name: Logout description: End your admin session securely icon: class: fa-solid fa-right-from-bracket - url: https://{{ domains | get_domain('web-app-keycloak') }}/realms/{{oidc.client.id}}/protocol/openid-connect/logout + url: {{ keycloak_url }}/realms/{{oidc.client.id}}/protocol/openid-connect/logout iframe: false {% endif %}