From b657117beb5772fa96cb9e73940c495fddafa725 Mon Sep 17 00:00:00 2001 From: Aine Date: Wed, 30 Aug 2023 23:03:33 +0300 Subject: [PATCH] schildichat fixes --- .../custom/matrix-client-schildichat/defaults/main.yml | 2 +- .../systemd/matrix-client-schildichat.service.j2 | 10 +++++----- setup.yml | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/custom/matrix-client-schildichat/defaults/main.yml b/roles/custom/matrix-client-schildichat/defaults/main.yml index a61d2cd6c..e446e755c 100644 --- a/roles/custom/matrix-client-schildichat/defaults/main.yml +++ b/roles/custom/matrix-client-schildichat/defaults/main.yml @@ -154,7 +154,7 @@ matrix_client_schildichat_welcome_user_id: ~ matrix_client_schildichat_brand: "schildichat" # URL to Logo on welcome page -matrix_client_schildichat_welcome_logo: "themes/schildichat/img/logos/schildichat-logo.svg" +matrix_client_schildichat_welcome_logo: "themes/element/img/logos/element-logo.svg" # URL of link on welcome image matrix_client_schildichat_welcome_logo_link: "https://schildi.chat" diff --git a/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 b/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 index b222d8867..8905f1ed7 100644 --- a/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 +++ b/roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2 @@ -26,15 +26,15 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% endif %} --label-file={{ matrix_client_schildichat_data_path }}/labels \ --tmpfs=/tmp:rw,noexec,nosuid,size=10m \ - --mount type=bind,src={{ matrix_client_schildichat_data_path }}/config.json,dst=/app/config.json,ro \ - --mount type=bind,src={{ matrix_client_schildichat_data_path }}/config.json,dst=/app/config.{{ matrix_server_fqn_schildichat }}.json,ro \ + --mount type=bind,src={{ matrix_client_schildichat_data_path }}/config.json,dst=/usr/share/nginx/html/config.json,ro \ + --mount type=bind,src={{ matrix_client_schildichat_data_path }}/config.json,dst=/usr/share/nginx/html/config.{{ matrix_server_fqn_schildichat }}.json,ro \ {% if matrix_client_schildichat_location_sharing_enabled %} - --mount type=bind,src={{ matrix_client_schildichat_data_path }}/map_style.json,dst=/app/map_style.json,ro \ + --mount type=bind,src={{ matrix_client_schildichat_data_path }}/map_style.json,dst=/usr/share/nginx/html/map_style.json,ro \ {% endif %} {% if matrix_client_schildichat_embedded_pages_home_path is not none %} - --mount type=bind,src={{ matrix_client_schildichat_data_path }}/home.html,dst=/app/home.html,ro \ + --mount type=bind,src={{ matrix_client_schildichat_data_path }}/home.html,dst=/usr/share/nginx/html/home.html,ro \ {% endif %} - --mount type=bind,src={{ matrix_client_schildichat_data_path }}/welcome.html,dst=/app/welcome.html,ro \ + --mount type=bind,src={{ matrix_client_schildichat_data_path }}/welcome.html,dst=/usr/share/nginx/html/welcome.html,ro \ {% for arg in matrix_client_schildichat_container_extra_arguments %} {{ arg }} \ {% endfor %} diff --git a/setup.yml b/setup.yml index 0c324700f..8c58b74ed 100644 --- a/setup.yml +++ b/setup.yml @@ -102,6 +102,7 @@ - custom/matrix-client-element - custom/matrix-client-hydrogen - custom/matrix-client-cinny + - custom/matrix-client-schildichat - galaxy/jitsi - custom/matrix-user-verification-service - custom/matrix-ldap-registration-proxy