Merge pull request #1974 from MdotAmaan/master
Add Mautrix Discord Bridge
This commit is contained in:
		| @@ -661,6 +661,44 @@ matrix_mautrix_whatsapp_database_password: "{{ '%s' | format(matrix_homeserver_g | ||||
| # | ||||
| ###################################################################### | ||||
|  | ||||
| ###################################################################### | ||||
| # | ||||
| # matrix-bridge-mautrix-discord | ||||
| # | ||||
| ###################################################################### | ||||
|  | ||||
| # We don't enable bridges by default. | ||||
| matrix_mautrix_discord_enabled: false | ||||
|  | ||||
| matrix_mautrix_discord_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}" | ||||
|  | ||||
| matrix_mautrix_discord_systemd_required_services_list: | | ||||
|   {{ | ||||
|     ['docker.service'] | ||||
|     + | ||||
|     ['matrix-' + matrix_homeserver_implementation + '.service'] | ||||
|     + | ||||
|     (['matrix-postgres.service'] if matrix_postgres_enabled else []) | ||||
|     + | ||||
|     (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else []) | ||||
|   }}  | ||||
|  | ||||
| matrix_mautrix_discord_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudisc.as.tok') | to_uuid }}" | ||||
|  | ||||
| matrix_mautrix_discord_homeserver_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudisc.hs.tok') | to_uuid }}" | ||||
|  | ||||
| matrix_mautrix_discord_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}" | ||||
|  | ||||
| # Postgres is the default, except if not using `matrix_postgres` (internal postgres) | ||||
| matrix_mautrix_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}" | ||||
| matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudiscord.db') | to_uuid }}" | ||||
|  | ||||
| ###################################################################### | ||||
| # | ||||
| # /matrix-bridge-mautrix-discord | ||||
| # | ||||
| ###################################################################### | ||||
|  | ||||
| ###################################################################### | ||||
| # | ||||
| # matrix-sms-bridge | ||||
| @@ -1914,6 +1952,12 @@ matrix_postgres_additional_databases: | | ||||
|       'password': matrix_mautrix_whatsapp_database_password, | ||||
|     }] if (matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_database_engine == 'postgres' and matrix_mautrix_whatsapp_database_hostname == 'matrix-postgres') else []) | ||||
|     + | ||||
|     ([{ | ||||
|       'name': matrix_mautrix_discord_database_name, | ||||
|       'username': matrix_mautrix_discord_database_username, | ||||
|       'password': matrix_mautrix_discord_database_password, | ||||
|     }] if (matrix_mautrix_discord_enabled and matrix_mautrix_discord_database_engine == 'postgres' and matrix_mautrix_discord_database_hostname == 'matrix-postgres') else []) | ||||
|     + | ||||
|     ([{ | ||||
|       'name': matrix_mx_puppet_slack_database_name, | ||||
|       'username': matrix_mx_puppet_slack_database_username, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user