kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-08-15 08:30:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced get_domain with get_url

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-08-13 23:33:49 +02:00
parent a40d48bb03
commit 41cd6b7702
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/web-app-espocrm/tasks/01_patch_config.yml
View File

@ -30,7 +30,7 @@
$c = $app->getContainer(); $c = $app->getContainer();
$cfg = $c->get("config"); $cfg = $c->get("config");
$writer = $c->get("injectableFactory")->create("\Espo\Core\Utils\Config\ConfigWriter"); $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) { if ($cfg->get("siteUrl") !== $new) {
$writer->set("siteUrl", $new); $writer->set("siteUrl", $new);
$writer->save(); $writer->save();

4
roles/web-app-espocrm/templates/env.j2
View File

@ -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) }} ESPOCRM_ADMIN_PASSWORD={{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}
# Public base URL of the EspoCRM instance # 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 # 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_USER_INFO_ENDPOINT={{ oidc.client.user_info_url }}
ESPOCRM_CONFIG_OIDC_JWKS_ENDPOINT={{ oidc.client.certs }} 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_SCOPES=openid,profile,email # Defined in main.yml
ESPOCRM_CONFIG_OIDC_CREATE_USER=true ESPOCRM_CONFIG_OIDC_CREATE_USER=true

5
roles/web-app-espocrm/vars/main.yml
View File

@ -5,7 +5,7 @@ application_id: "web-app-espocrm"
database_type: "mariadb" database_type: "mariadb"
# Webserver # Webserver
location_ws: "/ws" location_ws: "/ws"
ws_port: "{{ ports.localhost.websocket[application_id] }}" ws_port: "{{ ports.localhost.websocket[application_id] }}"
client_max_body_size: "100m" client_max_body_size: "100m"
vhost_flavour: "ws_generic" 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_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_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_volume: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
espocrm_config_file: "/var/www/html/data/config-internal.php" espocrm_config_file: "/var/www/html/data/config-internal.php"
espocrm_url: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}"

10
roles/web-app-port-ui/templates/menu/applications.yml.j2
View File

@ -24,27 +24,27 @@ applications:
icon: {{ app.icon }} icon: {{ app.icon }}
url: {{ app.url }} url: {{ app.url }}
iframe: {{ app.iframe }} iframe: {{ app.iframe }}
{% if app.title == 'Keycloak' %} {% if app.title == 'Keycloak' %}
{% set keycloak_url = domains | get_url(application_id, WEB_PROTOCOL) %}
{{ domains | get_url(application_id, WEB_PROTOCOL) }}
children: children:
- name: Administration - name: Administration
description: Access the central admin console description: Access the central admin console
icon: icon:
class: fa-solid fa-shield-halved 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) }} iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }}
- name: Profile - name: Profile
description: Update your personal admin settings description: Update your personal admin settings
icon: icon:
class: fa-solid fa-user-gear 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) }} iframe: {{ applications | get_app_conf( 'web-app-keycloak', 'features.port-ui-desktop', False) }}
- name: Logout - name: Logout
description: End your admin session securely description: End your admin session securely
icon: icon:
class: fa-solid fa-right-from-bracket 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 iframe: false
{% endif %} {% endif %}