Move matrix-bridge-mautrix-slack to its own container network
This commit is contained in:
parent
d6911503a0
commit
0f89156e94
@ -907,17 +907,24 @@ matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_ge
|
|||||||
# We don't enable bridges by default.
|
# We don't enable bridges by default.
|
||||||
matrix_mautrix_slack_enabled: false
|
matrix_mautrix_slack_enabled: false
|
||||||
|
|
||||||
|
matrix_mautrix_slack_systemd_required_services_list_auto: |
|
||||||
|
{{
|
||||||
|
matrix_addons_homeserver_systemd_services_list
|
||||||
|
+
|
||||||
|
([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_mautrix_slack_database_hostname == devture_postgres_connection_hostname) else [])
|
||||||
|
}}
|
||||||
|
|
||||||
matrix_mautrix_slack_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
|
matrix_mautrix_slack_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
|
||||||
|
|
||||||
matrix_mautrix_slack_systemd_required_services_list: |
|
matrix_mautrix_slack_container_network: "{{ matrix_addons_container_network }}"
|
||||||
|
|
||||||
|
matrix_mautrix_slack_container_additional_networks_auto: |-
|
||||||
{{
|
{{
|
||||||
['docker.service']
|
(
|
||||||
|
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
|
||||||
+
|
+
|
||||||
['matrix-' + matrix_homeserver_implementation + '.service']
|
([devture_postgres_container_network] if (devture_postgres_enabled and matrix_mautrix_slack_database_hostname == devture_postgres_connection_hostname and matrix_mautrix_slack_container_network != devture_postgres_container_network) else [])
|
||||||
+
|
) | unique
|
||||||
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
|
|
||||||
+
|
|
||||||
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
matrix_mautrix_slack_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mauslack.as.tok', rounds=655555) | to_uuid }}"
|
matrix_mautrix_slack_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mauslack.as.tok', rounds=655555) | to_uuid }}"
|
||||||
|
@ -32,11 +32,20 @@ matrix_mautrix_slack_bridge_permissions: |
|
|||||||
| combine({matrix_admin: 'admin'} if matrix_admin else {})
|
| combine({matrix_admin: 'admin'} if matrix_admin else {})
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
matrix_mautrix_slack_container_network: ""
|
||||||
|
|
||||||
|
matrix_mautrix_slack_container_additional_networks: "{{ matrix_mautrix_slack_container_additional_networks_auto + matrix_mautrix_slack_container_additional_networks_custom }}"
|
||||||
|
matrix_mautrix_slack_container_additional_networks_auto: []
|
||||||
|
matrix_mautrix_slack_container_additional_networks_custom: []
|
||||||
|
|
||||||
# A list of extra arguments to pass to the container
|
# A list of extra arguments to pass to the container
|
||||||
matrix_mautrix_slack_container_extra_arguments: []
|
matrix_mautrix_slack_container_extra_arguments: []
|
||||||
|
|
||||||
# List of systemd services that matrix-mautrix-slack.service depends on.
|
# List of systemd services that matrix-mautrix-slack.service depends on.
|
||||||
matrix_mautrix_slack_systemd_required_services_list: ['docker.service']
|
matrix_mautrix_slack_systemd_required_services_list: "{{ matrix_mautrix_slack_systemd_required_services_list_default + matrix_mautrix_slack_systemd_required_services_list_auto + matrix_mautrix_slack_systemd_required_services_list_custom }}"
|
||||||
|
matrix_mautrix_slack_systemd_required_services_list_default: ['docker.service']
|
||||||
|
matrix_mautrix_slack_systemd_required_services_list_auto: []
|
||||||
|
matrix_mautrix_slack_systemd_required_services_list_custom: []
|
||||||
|
|
||||||
# List of systemd services that matrix-mautrix-slack.service wants
|
# List of systemd services that matrix-mautrix-slack.service wants
|
||||||
matrix_mautrix_slack_systemd_wanted_services_list: []
|
matrix_mautrix_slack_systemd_wanted_services_list: []
|
||||||
|
@ -93,6 +93,11 @@
|
|||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
|
|
||||||
|
- name: Ensure matrix-mautrix-slack container network is created
|
||||||
|
community.general.docker_network:
|
||||||
|
name: "{{ matrix_mautrix_slack_container_network }}"
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
- name: Ensure matrix-mautrix-slack.service installed
|
- name: Ensure matrix-mautrix-slack.service installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-mautrix-slack.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-mautrix-slack.service.j2"
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
- {'name': 'matrix_mautrix_slack_homeserver_address', when: true}
|
- {'name': 'matrix_mautrix_slack_homeserver_address', when: true}
|
||||||
- {'name': 'matrix_mautrix_slack_homeserver_token', when: true}
|
- {'name': 'matrix_mautrix_slack_homeserver_token', when: true}
|
||||||
- {'name': 'matrix_mautrix_slack_database_hostname', when: "{{ matrix_mautrix_slack_database_engine == 'postgres' }}"}
|
- {'name': 'matrix_mautrix_slack_database_hostname', when: "{{ matrix_mautrix_slack_database_engine == 'postgres' }}"}
|
||||||
|
- {'name': 'matrix_mautrix_slack_container_network', when: true}
|
||||||
|
|
||||||
- name: Fail if appservice-slack and mautrix-slack have conflicting bot usernames
|
- name: Fail if appservice-slack and mautrix-slack have conflicting bot usernames
|
||||||
when: matrix_appservice_slack_enabled | default(False) | bool and matrix_mautrix_slack_appservice_bot_username == matrix_appservice_slack_bot_name | default ('')
|
when: matrix_appservice_slack_enabled | default(False) | bool and matrix_mautrix_slack_appservice_bot_username == matrix_appservice_slack_bot_name | default ('')
|
||||||
|
@ -19,11 +19,13 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
|
|||||||
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
||||||
ExecStartPre={{ matrix_host_command_sleep }} 5
|
ExecStartPre={{ matrix_host_command_sleep }} 5
|
||||||
|
|
||||||
ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mautrix-slack \
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
||||||
|
--rm \
|
||||||
|
--name=matrix-mautrix-slack \
|
||||||
--log-driver=none \
|
--log-driver=none \
|
||||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||||
--cap-drop=ALL \
|
--cap-drop=ALL \
|
||||||
--network={{ matrix_docker_network }} \
|
--network={{ matrix_mautrix_slack_container_network }} \
|
||||||
--mount type=bind,src={{ matrix_mautrix_slack_config_path }},dst=/config,ro \
|
--mount type=bind,src={{ matrix_mautrix_slack_config_path }},dst=/config,ro \
|
||||||
--mount type=bind,src={{ matrix_mautrix_slack_data_path }},dst=/data \
|
--mount type=bind,src={{ matrix_mautrix_slack_data_path }},dst=/data \
|
||||||
--workdir=/data \
|
--workdir=/data \
|
||||||
@ -33,6 +35,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
|
|||||||
{{ matrix_mautrix_slack_docker_image }} \
|
{{ matrix_mautrix_slack_docker_image }} \
|
||||||
/usr/bin/mautrix-slack -c /config/config.yaml -r /config/registration.yaml --no-update
|
/usr/bin/mautrix-slack -c /config/config.yaml -r /config/registration.yaml --no-update
|
||||||
|
|
||||||
|
{% for network in matrix_mautrix_slack_container_additional_networks %}
|
||||||
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mautrix-slack
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-mautrix-slack
|
||||||
|
|
||||||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mautrix-slack 2>/dev/null || true'
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mautrix-slack 2>/dev/null || true'
|
||||||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mautrix-slack 2>/dev/null || true'
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mautrix-slack 2>/dev/null || true'
|
||||||
Restart=always
|
Restart=always
|
||||||
|
Loading…
Reference in New Issue
Block a user