From 6c17671abd3e152300609a6abf5851d421637aa1 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 7 Feb 2023 10:45:19 +0200 Subject: [PATCH] Upgrade synapse-admin (0.8.6 -> 0.8.7) and drop reverse-proxy workaround Related to 6a31fba346d9da434, 6a31fba346d9d. Related to https://github.com/Awesome-Technologies/synapse-admin/issues/322 --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- .../tasks/inject_into_nginx_proxy.yml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index ae77a570..0f5c7af6 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -9,7 +9,7 @@ matrix_synapse_admin_container_image_self_build_repo: "https://github.com/Awesom matrix_synapse_admin_docker_src_files_path: "{{ matrix_base_data_path }}/synapse-admin/docker-src" -matrix_synapse_admin_version: 0.8.6 +matrix_synapse_admin_version: 0.8.7 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}awesometechnologies/synapse-admin:{{ matrix_synapse_admin_version }}" matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}" diff --git a/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml b/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml index 2c25ff47..6a4af859 100644 --- a/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml +++ b/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml @@ -24,15 +24,6 @@ {# Generic configuration for use outside of our container setup #} proxy_pass http://127.0.0.1:8766/$1; {% endif %} - - {# - Workaround synapse-admin serving all assets at /static. - See: https://github.com/Awesome-Technologies/synapse-admin/issues/322 - #} - sub_filter_once off; - sub_filter "/static/" "{{ matrix_synapse_admin_public_endpoint }}/static/"; - sub_filter "/favicon.ico" "{{ matrix_synapse_admin_public_endpoint }}/favicon.ico"; - sub_filter "/manifest.json" "{{ matrix_synapse_admin_public_endpoint }}/manifest.json"; } - name: Register Synapse Admin proxying configuration with matrix-nginx-proxy