From a71fa820c96f631390ba0bb3072f6165c2ac4435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Tue, 6 Sep 2022 09:24:42 +0200 Subject: [PATCH 1/2] Update roles/matrix-cactus-comments/tasks/setup_install.yml Co-authored-by: Slavi Pantaleev --- roles/matrix-cactus-comments/tasks/setup_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/matrix-cactus-comments/tasks/setup_install.yml b/roles/matrix-cactus-comments/tasks/setup_install.yml index e55f07e34..f0c1edadd 100644 --- a/roles/matrix-cactus-comments/tasks/setup_install.yml +++ b/roles/matrix-cactus-comments/tasks/setup_install.yml @@ -10,7 +10,7 @@ with_items: - {path: "{{ matrix_cactus_comments_base_path }}", when: true} - {path: "{{ matrix_cactus_comments_container_tmp_path }}", when: true} - - {path: "{{ matrix_cactus_comments_docker_src_files_path }}", when: true} + - {path: "{{ matrix_cactus_comments_docker_src_files_path }}", when: matrix_cactus_comments_container_image_self_build} when: "item.when | bool" - name: Ensure cactus comments environment file created From cac9fbd5c0f1c5a77a7826e11a4949845f816b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Tue, 6 Sep 2022 09:24:56 +0200 Subject: [PATCH 2/2] Update roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2 Co-authored-by: Slavi Pantaleev --- .../templates/cactus_appservice.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2 b/roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2 index c37fd2fec..c0599fbab 100644 --- a/roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2 +++ b/roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2 @@ -7,8 +7,8 @@ url: "http://matrix-cactus-comments:{{ matrix_cactus_comments_container_port }}" # Unique tokens used to authenticate requests between our service and the # homeserver (and the other way). Use the sha256 hashes of something random. # CHANGE THESE VALUES. -as_token: "{{ matrix_cactus_comments_as_token }}" -hs_token: "{{ matrix_cactus_comments_hs_token }}" +as_token: {{ matrix_cactus_comments_as_token | to_json }} +hs_token: {{ matrix_cactus_comments_hs_token | to_json }} # User associated with our service. In this case "@cactusbot:example.com" sender_localpart: "{{ matrix_cactus_comments_user_id }}"