finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make changes according to feedback

Browse Source 
Co-authored-by: Slavi Pantaleev <slavi@devture.com>

Update group_vars/matrix_servers

Co-authored-by: Slavi Pantaleev <slavi@devture.com>

Remove old data migration tasks

Co-authored-by: Slavi Pantaleev <slavi@devture.com>

Update roles/matrix-bridge-mautrix-discord/tasks/validate_config.yml

Co-authored-by: Slavi Pantaleev <slavi@devture.com>

Redo bridge permissions
This commit is contained in:
MdotAmaan
2022-07-28 22:14:45 +04:00
committed by MdotAmaan
parent 8621ff1379
commit 6fb961eb12
7 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2
View File

@ -2,9 +2,9 @@
# Homeserver details.
homeserver:
# The address that this appservice can use to connect to the homeserver.
address: {{ matrix_mautrix_discord_homeserver_address }}
address: {{ matrix_mautrix_discord_homeserver_address | to_json }}
# The domain of the homeserver (for MXIDs, etc).
domain: {{ matrix_mautrix_discord_homeserver_domain }}
domain: {{ matrix_mautrix_discord_homeserver_domain | to_json }}
# Is the homeserver actually mautrix-asmux?
asmux: false
# The URL to push real-time bridge status to.
@ -20,7 +20,7 @@ homeserver:
# Changing these values requires regeneration of the registration.
appservice:
# The address that the homeserver can use to connect to this appservice.
address: {{ matrix_mautrix_discord_appservice_address }}
address: {{ matrix_mautrix_discord_appservice_address | to_json }}
# The hostname and port where this appservice should listen.
hostname: 0.0.0.0
@ -58,8 +58,8 @@ appservice:
ephemeral_events: true
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
as_token: "{{ matrix_mautrix_discord_appservice_token }}"
hs_token: "{{ matrix_mautrix_discord_homeserver_token }}"
as_token: {{ matrix_mautrix_discord_appservice_token | to_json }}
hs_token: {{ matrix_mautrix_discord_homeserver_token | to_json }}
# Bridge config
bridge:
@ -208,11 +208,7 @@ bridge:
# * - All Matrix users
# domain - All users on that homeserver
# mxid - Specific user
permissions:
"{{ matrix_mautrix_discord_homeserver_domain }}": user
{% if matrix_admin %}
"{{ matrix_admin }}": admin
{% endif %}
permissions: {{ matrix_mautrix_discord_bridge_permissions|to_json }}
logging:
directory: ./logs
@ -220,6 +216,6 @@ logging:
file_date_format: "2006-01-02"
file_mode: 384
timestamp_format: Jan _2, 2006 15:04:05
print_level: {{ matrix_mautrix_discord_logging_level }}
print_level: {{ matrix_mautrix_discord_logging_level | to_json }}
print_json: false
file_json: false

4
roles/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2
View File

@ -24,8 +24,8 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-discor
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_docker_network }} \
-v {{ matrix_mautrix_discord_config_path }}:/config:z \
-v {{ matrix_mautrix_discord_data_path }}:/data:z \
--mount type=bind,src={{ matrix_mautrix_discord_config_path }},dst=/config,ro \
--mount type=bind,src={{ matrix_mautrix_discord_data_path }},dst=/data \
--workdir=/data \
{% for arg in matrix_mautrix_discord_container_extra_arguments %}
{{ arg }} \