mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-10 12:47:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into traefik

Browse Source
This commit is contained in:
Slavi Pantaleev 2023-02-08 18:48:10 +02:00
commit 88a26758e1
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/matrix_servers
View File

@ -2436,7 +2436,7 @@ matrix_ssl_domains_to_obtain_certificates_for: |
+ +
([matrix_server_fqn_ntfy] if matrix_ntfy_enabled else []) ([matrix_server_fqn_ntfy] if matrix_ntfy_enabled else [])
+ +
([matrix_bot_postmoogle_domain] if matrix_bot_postmoogle_enabled else []) (matrix_bot_postmoogle_domains if matrix_bot_postmoogle_enabled else [])
+ +
([matrix_domain] if matrix_nginx_proxy_base_domain_serving_enabled else []) ([matrix_domain] if matrix_nginx_proxy_base_domain_serving_enabled else [])
+ +

2
roles/custom/matrix-bot-postmoogle/templates/systemd/matrix-bot-postmoogle.service.j2
View File

@ -1,6 +1,6 @@
#jinja2: lstrip_blocks: "True" #jinja2: lstrip_blocks: "True"
[Unit] [Unit]
Description=Matrix helpdesk bot Description=Matrix Postmoogle bot
{% for service in matrix_bot_postmoogle_systemd_required_services_list %} {% for service in matrix_bot_postmoogle_systemd_required_services_list %}
Requires={{ service }} Requires={{ service }}
After={{ service }} After={{ service }}

2
roles/custom/matrix-bridge-heisenbridge/defaults/main.yml
View File

@ -4,7 +4,7 @@
matrix_heisenbridge_enabled: true matrix_heisenbridge_enabled: true
matrix_heisenbridge_version: 1.14.1 matrix_heisenbridge_version: 1.14.2
matrix_heisenbridge_docker_image: "{{ matrix_container_global_registry_prefix }}hif1/heisenbridge:{{ matrix_heisenbridge_version }}" matrix_heisenbridge_docker_image: "{{ matrix_container_global_registry_prefix }}hif1/heisenbridge:{{ matrix_heisenbridge_version }}"
matrix_heisenbridge_docker_image_force_pull: "{{ matrix_heisenbridge_docker_image.endswith(':latest') }}" matrix_heisenbridge_docker_image_force_pull: "{{ matrix_heisenbridge_docker_image.endswith(':latest') }}"

2
roles/custom/matrix-synapse-admin/defaults/main.yml
View File

@ -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_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: "{{ 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_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') }}" matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}"

9
roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml
View File

@ -24,15 +24,6 @@
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:8766/$1; proxy_pass http://127.0.0.1:8766/$1;
{% endif %} {% 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 - name: Register Synapse Admin proxying configuration with matrix-nginx-proxy

2
roles/custom/matrix-synapse-reverse-proxy-companion/tasks/setup_uninstall.yml
View File

@ -9,7 +9,7 @@
block: block:
- name: Ensure matrix-synapse-reverse-proxy-companion.service is stopped - name: Ensure matrix-synapse-reverse-proxy-companion.service is stopped
ansible.builtin.service: ansible.builtin.service:
name: matrix_synapse_reverse_proxy_companion_service_stat name: matrix-synapse-reverse-proxy-companion
state: stopped state: stopped
enabled: false enabled: false
daemon_reload: true daemon_reload: true