merge upstream
This commit is contained in:
Michael Collins
commit
9ac5ad148a
12
README.md
12
README.md
|
|
@ -45,17 +45,17 @@ Using this playbook, you can get the following services configured on your serve
|
||||||
|
|
||||||
- (optional, advanced) the [Matrix Corporal](https://github.com/devture/matrix-corporal) reconciliator and gateway for a managed Matrix server
|
- (optional, advanced) the [Matrix Corporal](https://github.com/devture/matrix-corporal) reconciliator and gateway for a managed Matrix server
|
||||||
|
|
||||||
- (optional) the [mautrix-telegram](https://github.com/tulir/mautrix-telegram) bridge for bridging your Matrix server to [Telegram](https://telegram.org/)
|
- (optional) the [mautrix-telegram](https://github.com/mautrix/telegram) bridge for bridging your Matrix server to [Telegram](https://telegram.org/)
|
||||||
|
|
||||||
- (optional) the [mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp) bridge for bridging your Matrix server to [WhatsApp](https://www.whatsapp.com/)
|
- (optional) the [mautrix-whatsapp](https://github.com/mautrix/whatsapp) bridge for bridging your Matrix server to [WhatsApp](https://www.whatsapp.com/)
|
||||||
|
|
||||||
- (optional) the [mautrix-facebook](https://github.com/tulir/mautrix-facebook) bridge for bridging your Matrix server to [Facebook](https://facebook.com/)
|
- (optional) the [mautrix-facebook](https://github.com/mautrix/facebook) bridge for bridging your Matrix server to [Facebook](https://facebook.com/)
|
||||||
|
|
||||||
- (optional) the [mautrix-hangouts](https://github.com/tulir/mautrix-hangouts) bridge for bridging your Matrix server to [Google Hangouts](https://en.wikipedia.org/wiki/Google_Hangouts)
|
- (optional) the [mautrix-hangouts](https://github.com/mautrix/hangouts) bridge for bridging your Matrix server to [Google Hangouts](https://en.wikipedia.org/wiki/Google_Hangouts)
|
||||||
|
|
||||||
- (optional) the [mautrix-instagram](https://github.com/tulir/mautrix-instagram) bridge for bridging your Matrix server to [Instagram](https://instagram.com/)
|
- (optional) the [mautrix-instagram](https://github.com/mautrix/instagram) bridge for bridging your Matrix server to [Instagram](https://instagram.com/)
|
||||||
|
|
||||||
- (optional) the [mautrix-signal](https://github.com/tulir/mautrix-signal) bridge for bridging your Matrix server to [Signal](https://www.signal.org/)
|
- (optional) the [mautrix-signal](https://github.com/mautrix/signal) bridge for bridging your Matrix server to [Signal](https://www.signal.org/)
|
||||||
|
|
||||||
- (optional) the [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) bridge for bridging your Matrix server to [IRC](https://wikipedia.org/wiki/Internet_Relay_Chat)
|
- (optional) the [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) bridge for bridging your Matrix server to [IRC](https://wikipedia.org/wiki/Internet_Relay_Chat)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Setting up Mautrix Facebook (optional)
|
# Setting up Mautrix Facebook (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-facebook](https://github.com/tulir/mautrix-facebook) for you.
|
The playbook can install and configure [mautrix-facebook](https://github.com/mautrix/facebook) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://github.com/tulir/mautrix-facebook/blob/master/ROADMAP.md) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://github.com/mautrix/facebook/blob/master/ROADMAP.md) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
matrix_mautrix_facebook_enabled: true
|
matrix_mautrix_facebook_enabled: true
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Setting up Mautrix Hangouts (optional)
|
# Setting up Mautrix Hangouts (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-hangouts](https://github.com/tulir/mautrix-hangouts) for you.
|
The playbook can install and configure [mautrix-hangouts](https://github.com/mautrix/hangouts) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://github.com/tulir/mautrix-hangouts/wiki#usage) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://docs.mau.fi/bridges/python/hangouts/index.html) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
To enable the [Google Hangouts](https://hangouts.google.com/) bridge just use the following playbook configuration:
|
To enable the [Google Hangouts](https://hangouts.google.com/) bridge just use the following playbook configuration:
|
||||||
|
|
||||||
|
|
@ -14,7 +14,7 @@ matrix_mautrix_hangouts_enabled: true
|
||||||
|
|
||||||
## Set up Double Puppeting
|
## Set up Double Puppeting
|
||||||
|
|
||||||
If you'd like to use [Double Puppeting](https://github.com/tulir/mautrix-hangouts/wiki/Authentication#double-puppeting) (hint: you most likely do), you have 2 ways of going about it.
|
If you'd like to use [Double Puppeting](https://docs.mau.fi/bridges/general/double-puppeting.html) (hint: you most likely do), you have 2 ways of going about it.
|
||||||
|
|
||||||
### Method 1: automatically, by enabling Shared Secret Auth
|
### Method 1: automatically, by enabling Shared Secret Auth
|
||||||
|
|
||||||
|
|
@ -52,7 +52,7 @@ Automatic login may not work. If it does not, reload the page and select the "Ma
|
||||||
|
|
||||||
Once logged in, recent chats should show up as new conversations automatically. Other chats will get portals as you receive messages.
|
Once logged in, recent chats should show up as new conversations automatically. Other chats will get portals as you receive messages.
|
||||||
|
|
||||||
You can learn more about authentication from the bridge's [official documentation on Authentication](https://github.com/tulir/mautrix-hangouts/wiki/Authentication).
|
You can learn more about authentication from the bridge's [official documentation on Authentication](https://docs.mau.fi/bridges/python/hangouts/authentication.html).
|
||||||
|
|
||||||
After successfully enabling bridging, you may wish to [set up Double Puppeting](#set-up-double-puppeting), if you haven't already done so.
|
After successfully enabling bridging, you may wish to [set up Double Puppeting](#set-up-double-puppeting), if you haven't already done so.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Setting up Mautrix Instagram (optional)
|
# Setting up Mautrix Instagram (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-instagram](https://github.com/tulir/mautrix-instagram) for you.
|
The playbook can install and configure [mautrix-instagram](https://github.com/mautrix/instagram) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://docs.mau.fi/bridges/python/instagram/index.html) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://docs.mau.fi/bridges/python/instagram/index.html) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Setting up Mautrix Signal (optional)
|
# Setting up Mautrix Signal (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-signal](https://github.com/tulir/mautrix-signal) for you.
|
The playbook can install and configure [mautrix-signal](https://github.com/mautrix/signal) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://github.com/tulir/mautrix-signal/wiki) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://docs.mau.fi/bridges/python/signal/index.html) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
**Note/Prerequisite**: If you're running with the Postgres database server integrated by the playbook (which is the default), you don't need to do anything special and can easily proceed with installing. However, if you're [using an external Postgres server](configuring-playbook-external-postgres.md), you'd need to manually prepare a Postgres database for this bridge and adjust the variables related to that (`matrix_mautrix_signal_database_*`).
|
**Note/Prerequisite**: If you're running with the Postgres database server integrated by the playbook (which is the default), you don't need to do anything special and can easily proceed with installing. However, if you're [using an external Postgres server](configuring-playbook-external-postgres.md), you'd need to manually prepare a Postgres database for this bridge and adjust the variables related to that (`matrix_mautrix_signal_database_*`).
|
||||||
|
|
||||||
|
|
@ -12,9 +12,54 @@ Use the following playbook configuration:
|
||||||
matrix_mautrix_signal_enabled: true
|
matrix_mautrix_signal_enabled: true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
There are some additional things you may wish to configure about the bridge before you continue.
|
||||||
|
|
||||||
|
The relay bot functionality is off by default. If you would like to enable the relay bot, add the following to your `vars.yml` file:
|
||||||
|
```yaml
|
||||||
|
matrix_mautrix_signal_relaybot_enabled: true
|
||||||
|
```
|
||||||
|
If you want to activate the relay bot in a room, use `!signal set-relay`.
|
||||||
|
Use `!signal unset-relay` to deactivate.
|
||||||
|
By default, any user on your homeserver will be able to use the bridge.
|
||||||
|
If you enable the relay bot functionality, it will relay every user's messages in a portal room - no matter which homeserver they're from.
|
||||||
|
|
||||||
|
Different levels of permission can be granted to users:
|
||||||
|
|
||||||
|
* relay - Allowed to be relayed through the bridge, no access to commands;
|
||||||
|
* user - Use the bridge with puppeting;
|
||||||
|
* admin - Use and administer the bridge.
|
||||||
|
|
||||||
|
The permissions are following the sequence: nothing < relay < user < admin.
|
||||||
|
|
||||||
|
The default permissions are set as follows:
|
||||||
|
```yaml
|
||||||
|
permissions:
|
||||||
|
'*': relay
|
||||||
|
YOUR_DOMAIN: user
|
||||||
|
```
|
||||||
|
|
||||||
|
If you want to augment the preset permissions, you might want to set the additional permissions with the following settings in your `vars.yml` file:
|
||||||
|
```yaml
|
||||||
|
matrix_mautrix_signal_configuration_extension_yaml: |
|
||||||
|
bridge:
|
||||||
|
permissions:
|
||||||
|
'@YOUR_USERNAME:YOUR_DOMAIN': admin
|
||||||
|
```
|
||||||
|
|
||||||
|
This will add the admin permission to the specific user, while keepting the default permissions.
|
||||||
|
|
||||||
|
In case you want to replace the default permissions settings **completely**, populate the following item within your `vars.yml` file:
|
||||||
|
```yaml
|
||||||
|
matrix_mautrix_signal_bridge_permissions: |
|
||||||
|
'@ADMIN:YOUR_DOMAIN': admin
|
||||||
|
'@USER:YOUR_DOMAIN' : user
|
||||||
|
```
|
||||||
|
|
||||||
|
You may wish to look at `roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2` to find more information on the permissions settings and other options you would like to configure.
|
||||||
|
|
||||||
## Set up Double Puppeting
|
## Set up Double Puppeting
|
||||||
|
|
||||||
If you'd like to use [Double Puppeting](https://github.com/tulir/mautrix-signal/wiki/Authentication#double-puppeting) (hint: you most likely do), you have 2 ways of going about it.
|
If you'd like to use [Double Puppeting](https://docs.mau.fi/bridges/general/double-puppeting.html) (hint: you most likely do), you have 2 ways of going about it.
|
||||||
|
|
||||||
### Method 1: automatically, by enabling Shared Secret Auth
|
### Method 1: automatically, by enabling Shared Secret Auth
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Setting up Mautrix Telegram (optional)
|
# Setting up Mautrix Telegram (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-telegram](https://github.com/tulir/mautrix-telegram) for you.
|
The playbook can install and configure [mautrix-telegram](https://github.com/mautrix/telegram) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://github.com/tulir/mautrix-telegram/wiki#usage) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://docs.mau.fi/bridges/python/telegram/index.html) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
You'll need to obtain API keys from [https://my.telegram.org/apps](https://my.telegram.org/apps) and then use the following playbook configuration:
|
You'll need to obtain API keys from [https://my.telegram.org/apps](https://my.telegram.org/apps) and then use the following playbook configuration:
|
||||||
|
|
||||||
|
|
@ -14,7 +14,7 @@ matrix_mautrix_telegram_api_hash: YOUR_TELEGRAM_API_HASH
|
||||||
|
|
||||||
## Set up Double Puppeting
|
## Set up Double Puppeting
|
||||||
|
|
||||||
If you'd like to use [Double Puppeting](https://github.com/tulir/mautrix-telegram/wiki/Authentication#replacing-telegram-accounts-matrix-puppet-with-matrix-account) (hint: you most likely do), you have 2 ways of going about it.
|
If you'd like to use [Double Puppeting](https://docs.mau.fi/bridges/general/double-puppeting.html) (hint: you most likely do), you have 2 ways of going about it.
|
||||||
|
|
||||||
### Method 1: automatically, by enabling Shared Secret Auth
|
### Method 1: automatically, by enabling Shared Secret Auth
|
||||||
|
|
||||||
|
|
@ -45,7 +45,7 @@ https://matrix.DOMAIN/_matrix/client/r0/login
|
||||||
|
|
||||||
You then need to start a chat with `@telegrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain).
|
You then need to start a chat with `@telegrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain).
|
||||||
|
|
||||||
If you want to use the relay-bot feature ([relay bot documentation](https://github.com/tulir/mautrix-telegram/wiki/Relay-bot)), which allows anonymous user to chat with telegram users, use the following additional playbook configuration:
|
If you want to use the relay-bot feature ([relay bot documentation](https://docs.mau.fi/bridges/python/telegram/relay-bot.html)), which allows anonymous user to chat with telegram users, use the following additional playbook configuration:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
matrix_mautrix_telegram_bot_token: YOUR_TELEGRAM_BOT_TOKEN
|
matrix_mautrix_telegram_bot_token: YOUR_TELEGRAM_BOT_TOKEN
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Setting up Mautrix Whatsapp (optional)
|
# Setting up Mautrix Whatsapp (optional)
|
||||||
|
|
||||||
The playbook can install and configure [mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp) for you.
|
The playbook can install and configure [mautrix-whatsapp](https://github.com/mautrix/whatsapp) for you.
|
||||||
|
|
||||||
See the project's [documentation](https://github.com/tulir/mautrix-whatsapp/wiki) to learn what it does and why it might be useful to you.
|
See the project's [documentation](https://docs.mau.fi/bridges/go/whatsapp/index.html) to learn what it does and why it might be useful to you.
|
||||||
|
|
||||||
Use the following playbook configuration:
|
Use the following playbook configuration:
|
||||||
|
|
||||||
|
|
@ -13,7 +13,7 @@ matrix_mautrix_whatsapp_enabled: true
|
||||||
|
|
||||||
## Set up Double Puppeting
|
## Set up Double Puppeting
|
||||||
|
|
||||||
If you'd like to use [Double Puppeting](https://github.com/tulir/mautrix-whatsapp/wiki/Authentication#replacing-whatsapp-accounts-matrix-puppet-with-matrix-account) (hint: you most likely do), you have 2 ways of going about it.
|
If you'd like to use [Double Puppeting](https://docs.mau.fi/bridges/general/double-puppeting.html) (hint: you most likely do), you have 2 ways of going about it.
|
||||||
|
|
||||||
### Method 1: automatically, by enabling Shared Secret Auth
|
### Method 1: automatically, by enabling Shared Secret Auth
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,17 +40,17 @@ These services are not part of our default installation, but can be enabled by [
|
||||||
|
|
||||||
- [zeratax/matrix-registration](https://hub.docker.com/r/devture/zeratax-matrix-registration/) - [matrix-registration](https://github.com/ZerataX/matrix-registration): a simple python application to have a token based matrix registration (optional)
|
- [zeratax/matrix-registration](https://hub.docker.com/r/devture/zeratax-matrix-registration/) - [matrix-registration](https://github.com/ZerataX/matrix-registration): a simple python application to have a token based matrix registration (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-telegram](https://mau.dev/tulir/mautrix-telegram/container_registry) - the [mautrix-telegram](https://github.com/tulir/mautrix-telegram) bridge to [Telegram](https://telegram.org/) (optional)
|
- [mautrix/telegram](https://mau.dev/mautrix/telegram/container_registry) - the [mautrix-telegram](https://github.com/mautrix/telegram) bridge to [Telegram](https://telegram.org/) (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-whatsapp](https://mau.dev/tulir/mautrix-whatsapp/container_registry) - the [mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp) bridge to [Whatsapp](https://www.whatsapp.com/) (optional)
|
- [mautrix/whatsapp](https://mau.dev/mautrix/whatsapp/container_registry) - the [mautrix-whatsapp](https://github.com/mautrix/whatsapp) bridge to [Whatsapp](https://www.whatsapp.com/) (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-facebook](https://mau.dev/tulir/mautrix-facebook/container_registry) - the [mautrix-facebook](https://github.com/tulir/mautrix-facebook) bridge to [Facebook](https://facebook.com/) (optional)
|
- [mautrix/facebook](https://mau.dev/mautrix/facebook/container_registry) - the [mautrix-facebook](https://github.com/mautrix/facebook) bridge to [Facebook](https://facebook.com/) (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-hangouts](https://mau.dev/tulir/mautrix-hangouts/container_registry) - the [mautrix-hangouts](https://github.com/tulir/mautrix-hangouts) bridge to [Google Hangouts](https://en.wikipedia.org/wiki/Google_Hangouts) (optional)
|
- [mautrix/hangouts](https://mau.dev/mautrix/hangouts/container_registry) - the [mautrix-hangouts](https://github.com/mautrix/hangouts) bridge to [Google Hangouts](https://en.wikipedia.org/wiki/Google_Hangouts) (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-instagram](https://mau.dev/tulir/mautrix-instagram/container_registry) - the [mautrix-instagram](https://github.com/tulir/mautrix-instagram) bridge to [Instagram](https://instagram.com/) (optional)
|
- [mautrix/instagram](https://mau.dev/mautrix/instagram/container_registry) - the [mautrix-instagram](https://github.com/mautrix/instagram) bridge to [Instagram](https://instagram.com/) (optional)
|
||||||
|
|
||||||
- [tulir/mautrix-signal](https://mau.dev/tulir/mautrix-signal/container_registry) - the [mautrix-signal](https://github.com/tulir/mautrix-signal) bridge to [Signal](https://www.signal.org/) (optional)
|
- [mautrix/signal](https://mau.dev/mautrix/signal/container_registry) - the [mautrix-signal](https://github.com/mautrix/signal) bridge to [Signal](https://www.signal.org/) (optional)
|
||||||
|
|
||||||
- [matrixdotorg/matrix-appservice-irc](https://hub.docker.com/r/matrixdotorg/matrix-appservice-irc) - the [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) bridge to [IRC](https://wikipedia.org/wiki/Internet_Relay_Chat) (optional)
|
- [matrixdotorg/matrix-appservice-irc](https://hub.docker.com/r/matrixdotorg/matrix-appservice-irc) - the [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) bridge to [IRC](https://wikipedia.org/wiki/Internet_Relay_Chat) (optional)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,11 +42,7 @@ matrix_awx_enabled: false
|
||||||
matrix_nginx_proxy_data_path: "{{ '/chroot/website' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else (matrix_nginx_proxy_base_path + '/data') }}"
|
matrix_nginx_proxy_data_path: "{{ '/chroot/website' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else (matrix_nginx_proxy_base_path + '/data') }}"
|
||||||
matrix_nginx_proxy_data_path_in_container: "{{ '/nginx-data/matrix-domain' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/nginx-data' }}"
|
matrix_nginx_proxy_data_path_in_container: "{{ '/nginx-data/matrix-domain' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/nginx-data' }}"
|
||||||
matrix_nginx_proxy_data_path_extension: "{{ '' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/matrix-domain' }}"
|
matrix_nginx_proxy_data_path_extension: "{{ '' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/matrix-domain' }}"
|
||||||
<<<<<<< HEAD
|
|
||||||
matrix_nginx_proxy_base_domain_create_directory: "{{ false if matrix_awx_enabled else true }}"
|
|
||||||
=======
|
|
||||||
matrix_nginx_proxy_base_domain_create_directory: "{{ not matrix_awx_enabled }}"
|
matrix_nginx_proxy_base_domain_create_directory: "{{ not matrix_awx_enabled }}"
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
# mautrix-facebook is a Matrix <-> Facebook bridge
|
# mautrix-facebook is a Matrix <-> Facebook bridge
|
||||||
# See: https://github.com/tulir/mautrix-facebook
|
# See: https://github.com/mautrix/facebook
|
||||||
|
|
||||||
matrix_mautrix_facebook_enabled: true
|
matrix_mautrix_facebook_enabled: true
|
||||||
|
|
||||||
matrix_mautrix_facebook_container_image_self_build: false
|
matrix_mautrix_facebook_container_image_self_build: false
|
||||||
matrix_mautrix_facebook_container_image_self_build_repo: "https://github.com/tulir/mautrix-facebook.git"
|
matrix_mautrix_facebook_container_image_self_build_repo: "https://mau.dev/mautrix/facebook.git"
|
||||||
|
|
||||||
matrix_mautrix_facebook_version: latest
|
matrix_mautrix_facebook_version: v0.3.1
|
||||||
# See: https://mau.dev/tulir/mautrix-facebook/container_registry
|
matrix_mautrix_facebook_docker_image: "{{ matrix_mautrix_facebook_docker_image_name_prefix }}mautrix/facebook:{{ matrix_mautrix_facebook_version }}"
|
||||||
matrix_mautrix_facebook_docker_image: "{{ matrix_mautrix_facebook_docker_image_name_prefix }}tulir/mautrix-facebook:{{ matrix_mautrix_facebook_version }}"
|
|
||||||
matrix_mautrix_facebook_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_facebook_container_image_self_build else 'dock.mau.dev/' }}"
|
matrix_mautrix_facebook_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_facebook_container_image_self_build else 'dock.mau.dev/' }}"
|
||||||
matrix_mautrix_facebook_docker_image_force_pull: "{{ matrix_mautrix_facebook_docker_image.endswith(':latest') }}"
|
matrix_mautrix_facebook_docker_image_force_pull: "{{ matrix_mautrix_facebook_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
|
@ -107,7 +106,7 @@ matrix_mautrix_facebook_registration_yaml: |
|
||||||
- exclusive: true
|
- exclusive: true
|
||||||
regex: '^@{{ matrix_mautrix_facebook_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_facebook_homeserver_domain|regex_escape }}$'
|
regex: '^@{{ matrix_mautrix_facebook_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_facebook_homeserver_domain|regex_escape }}$'
|
||||||
url: {{ matrix_mautrix_facebook_appservice_address }}
|
url: {{ matrix_mautrix_facebook_appservice_address }}
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_facebook_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_facebook_appservice_bot_username }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
de.sorunome.msc2409.push_ephemeral: true
|
de.sorunome.msc2409.push_ephemeral: true
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
# mautrix-hangouts is a Matrix <-> Hangouts bridge
|
# mautrix-hangouts is a Matrix <-> Hangouts bridge
|
||||||
# See: https://github.com/tulir/mautrix-hangouts
|
# See: https://github.com/mautrix/hangouts
|
||||||
|
|
||||||
matrix_mautrix_hangouts_enabled: true
|
matrix_mautrix_hangouts_enabled: true
|
||||||
|
|
||||||
matrix_mautrix_hangouts_container_image_self_build: false
|
matrix_mautrix_hangouts_container_image_self_build: false
|
||||||
matrix_mautrix_hangouts_container_image_self_build_repo: "https://github.com/tulir/mautrix-hangouts.git"
|
matrix_mautrix_hangouts_container_image_self_build_repo: "https://github.com/mautrix/hangouts.git"
|
||||||
|
|
||||||
matrix_mautrix_hangouts_version: latest
|
matrix_mautrix_hangouts_version: latest
|
||||||
# See: https://mau.dev/tulir/mautrix-hangouts/container_registry
|
# See: https://mau.dev/mautrix/hangouts/container_registry
|
||||||
matrix_mautrix_hangouts_docker_image: "{{ matrix_mautrix_hangouts_docker_image_name_prefix }}tulir/mautrix-hangouts:{{ matrix_mautrix_hangouts_version }}"
|
matrix_mautrix_hangouts_docker_image: "{{ matrix_mautrix_hangouts_docker_image_name_prefix }}mautrix/hangouts:{{ matrix_mautrix_hangouts_version }}"
|
||||||
matrix_mautrix_hangouts_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_hangouts_container_image_self_build else 'dock.mau.dev/' }}"
|
matrix_mautrix_hangouts_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_hangouts_container_image_self_build else 'dock.mau.dev/' }}"
|
||||||
matrix_mautrix_hangouts_docker_image_force_pull: "{{ matrix_mautrix_hangouts_docker_image.endswith(':latest') }}"
|
matrix_mautrix_hangouts_docker_image_force_pull: "{{ matrix_mautrix_hangouts_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
|
@ -107,7 +107,7 @@ matrix_mautrix_hangouts_registration_yaml: |
|
||||||
- exclusive: true
|
- exclusive: true
|
||||||
regex: '^@{{ matrix_mautrix_hangouts_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_hangouts_homeserver_domain|regex_escape }}$'
|
regex: '^@{{ matrix_mautrix_hangouts_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_hangouts_homeserver_domain|regex_escape }}$'
|
||||||
url: {{ matrix_mautrix_hangouts_appservice_address }}
|
url: {{ matrix_mautrix_hangouts_appservice_address }}
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_hangouts_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_hangouts_appservice_bot_username }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
de.sorunome.msc2409.push_ephemeral: true
|
de.sorunome.msc2409.push_ephemeral: true
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
# mautrix-instagram is a Matrix <-> Instagram bridge
|
# mautrix-instagram is a Matrix <-> Instagram bridge
|
||||||
# See: https://github.com/tulir/mautrix-instagram
|
# See: https://github.com/mautrix/instagram
|
||||||
|
|
||||||
matrix_mautrix_instagram_enabled: true
|
matrix_mautrix_instagram_enabled: true
|
||||||
|
|
||||||
matrix_mautrix_instagram_container_image_self_build: false
|
matrix_mautrix_instagram_container_image_self_build: false
|
||||||
matrix_mautrix_instagram_container_image_self_build_repo: "https://github.com/tulir/mautrix-instagram.git"
|
matrix_mautrix_instagram_container_image_self_build_repo: "https://github.com/mautrix/instagram.git"
|
||||||
|
|
||||||
matrix_mautrix_instagram_version: latest
|
matrix_mautrix_instagram_version: latest
|
||||||
# See: https://mau.dev/tulir/mautrix-instagram/container_registry
|
# See: https://mau.dev/tulir/mautrix-instagram/container_registry
|
||||||
matrix_mautrix_instagram_docker_image: "{{ matrix_mautrix_instagram_docker_image_name_prefix }}tulir/mautrix-instagram:{{ matrix_mautrix_instagram_version }}"
|
matrix_mautrix_instagram_docker_image: "{{ matrix_mautrix_instagram_docker_image_name_prefix }}mautrix/instagram:{{ matrix_mautrix_instagram_version }}"
|
||||||
matrix_mautrix_instagram_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_instagram_container_image_self_build else 'dock.mau.dev/' }}"
|
matrix_mautrix_instagram_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_instagram_container_image_self_build else 'dock.mau.dev/' }}"
|
||||||
matrix_mautrix_instagram_docker_image_force_pull: "{{ matrix_mautrix_instagram_docker_image.endswith(':latest') }}"
|
matrix_mautrix_instagram_docker_image_force_pull: "{{ matrix_mautrix_instagram_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
|
@ -97,7 +97,7 @@ matrix_mautrix_instagram_registration_yaml: |
|
||||||
- exclusive: true
|
- exclusive: true
|
||||||
regex: '^@{{ matrix_mautrix_instagram_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_instagram_homeserver_domain|regex_escape }}$'
|
regex: '^@{{ matrix_mautrix_instagram_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_instagram_homeserver_domain|regex_escape }}$'
|
||||||
url: {{ matrix_mautrix_instagram_appservice_address }}
|
url: {{ matrix_mautrix_instagram_appservice_address }}
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_instagram_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_instagram_appservice_bot_username }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
de.sorunome.msc2409.push_ephemeral: true
|
de.sorunome.msc2409.push_ephemeral: true
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,22 @@ matrix_mautrix_signal_appservice_database: "{{
|
||||||
# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
|
# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
|
||||||
matrix_mautrix_signal_login_shared_secret: ''
|
matrix_mautrix_signal_login_shared_secret: ''
|
||||||
|
|
||||||
|
# Enable bridge relay bot functionality
|
||||||
|
matrix_mautrix_signal_relaybot_enabled: false
|
||||||
|
|
||||||
|
# Permissions for using the bridge.
|
||||||
|
# Permitted values:
|
||||||
|
# relay - Allowed to be relayed through the bridge, no access to commands.
|
||||||
|
# user - Use the bridge with puppeting.
|
||||||
|
# admin - Use and administrate the bridge.
|
||||||
|
# Permitted keys:
|
||||||
|
# * - All Matrix users
|
||||||
|
# domain - All users on that homeserver
|
||||||
|
# mxid - Specific user
|
||||||
|
matrix_mautrix_signal_bridge_permissions: |
|
||||||
|
'*': relay
|
||||||
|
'{{ matrix_mautrix_signal_homeserver_domain }}': user
|
||||||
|
|
||||||
# Default configuration template which covers the generic use case.
|
# Default configuration template which covers the generic use case.
|
||||||
# You can customize it by controlling the various variables inside it.
|
# You can customize it by controlling the various variables inside it.
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,12 @@ homeserver:
|
||||||
# Only applies if address starts with https://
|
# Only applies if address starts with https://
|
||||||
verify_ssl: true
|
verify_ssl: true
|
||||||
asmux: false
|
asmux: false
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# Number of retries for all HTTP requests if the homeserver isn't reachable.
|
# Number of retries for all HTTP requests if the homeserver isn't reachable.
|
||||||
http_retry_count: 4
|
http_retry_count: 4
|
||||||
# The URL to push real-time bridge status to.
|
# The URL to push real-time bridge status to.
|
||||||
# If set, the bridge will make POST requests to this URL whenever a user's Signal connection state changes.
|
# If set, the bridge will make POST requests to this URL whenever a user's Signal connection state changes.
|
||||||
# The bridge will use the appservice as_token to authorize requests.
|
# The bridge will use the appservice as_token to authorize requests.
|
||||||
status_endpoint: null
|
status_endpoint: null
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
# Application service host/registration related details
|
# Application service host/registration related details
|
||||||
# Changing these values requires regeneration of the registration.
|
# Changing these values requires regeneration of the registration.
|
||||||
|
|
@ -89,12 +86,9 @@ signal:
|
||||||
avatar_dir: /signald/avatars
|
avatar_dir: /signald/avatars
|
||||||
# Directory where signald stores auth data. Used to delete data when logging out.
|
# Directory where signald stores auth data. Used to delete data when logging out.
|
||||||
data_dir: /signald/data
|
data_dir: /signald/data
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# Whether or not unknown signald accounts should be deleted when the bridge is started.
|
# Whether or not unknown signald accounts should be deleted when the bridge is started.
|
||||||
# When this is enabled, any UserInUse errors should be resolved by restarting the bridge.
|
# When this is enabled, any UserInUse errors should be resolved by restarting the bridge.
|
||||||
delete_unknown_accounts_on_start: false
|
delete_unknown_accounts_on_start: false
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Whether or not message attachments should be removed from disk after they're bridged.
|
# Whether or not message attachments should be removed from disk after they're bridged.
|
||||||
remove_file_after_handling: true
|
remove_file_after_handling: true
|
||||||
|
|
||||||
|
|
@ -146,7 +140,7 @@ bridge:
|
||||||
# If false, created portal rooms will never be federated.
|
# If false, created portal rooms will never be federated.
|
||||||
federate_rooms: true
|
federate_rooms: true
|
||||||
# End-to-bridge encryption support options. You must install the e2be optional dependency for
|
# End-to-bridge encryption support options. You must install the e2be optional dependency for
|
||||||
# this to work. See https://github.com/tulir/mautrix-telegram/wiki/End‐to‐bridge-encryption
|
# this to work. See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html
|
||||||
encryption:
|
encryption:
|
||||||
# Allow encryption, work in group chat rooms with e2ee enabled
|
# Allow encryption, work in group chat rooms with e2ee enabled
|
||||||
allow: false
|
allow: false
|
||||||
|
|
@ -179,21 +173,15 @@ bridge:
|
||||||
# This field will automatically be changed back to false after it,
|
# This field will automatically be changed back to false after it,
|
||||||
# except if the config file is not writable.
|
# except if the config file is not writable.
|
||||||
resend_bridge_info: false
|
resend_bridge_info: false
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# Interval at which to resync contacts.
|
# Interval at which to resync contacts.
|
||||||
periodic_sync: 0
|
periodic_sync: 0
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
# The prefix for commands. Only required in non-management rooms.
|
# The prefix for commands. Only required in non-management rooms.
|
||||||
command_prefix: "!signal"
|
command_prefix: "!signal"
|
||||||
|
|
||||||
# Permissions for using the bridge.
|
# Permissions for using the bridge.
|
||||||
# Permitted values:
|
# Permitted values:
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# relay - Allowed to be relayed through the bridge, no access to commands.
|
# relay - Allowed to be relayed through the bridge, no access to commands.
|
||||||
>>>>>>> upstream/master
|
|
||||||
# user - Use the bridge with puppeting.
|
# user - Use the bridge with puppeting.
|
||||||
# admin - Use and administrate the bridge.
|
# admin - Use and administrate the bridge.
|
||||||
# Permitted keys:
|
# Permitted keys:
|
||||||
|
|
@ -201,17 +189,12 @@ bridge:
|
||||||
# domain - All users on that homeserver
|
# domain - All users on that homeserver
|
||||||
# mxid - Specific user
|
# mxid - Specific user
|
||||||
permissions:
|
permissions:
|
||||||
<<<<<<< HEAD
|
{{ matrix_mautrix_signal_bridge_permissions|from_yaml }}
|
||||||
'{{ matrix_mautrix_signal_homeserver_domain }}': user
|
|
||||||
|
|
||||||
=======
|
|
||||||
'{{ matrix_mautrix_signal_homeserver_domain }}': relay
|
|
||||||
'{{ matrix_mautrix_signal_homeserver_domain }}': user
|
|
||||||
|
|
||||||
relay:
|
relay:
|
||||||
# Whether or not relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any
|
# Whether or not relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any
|
||||||
# authenticated user into a relaybot for that chat.
|
# authenticated user into a relaybot for that chat.
|
||||||
enabled: true
|
enabled: {{ matrix_mautrix_signal_relaybot_enabled }}
|
||||||
# The formats to use when sending messages to Signal via a relay user.
|
# The formats to use when sending messages to Signal via a relay user.
|
||||||
#
|
#
|
||||||
# Available variables:
|
# Available variables:
|
||||||
|
|
@ -229,7 +212,6 @@ bridge:
|
||||||
m.video: '$sender_displayname sent a video'
|
m.video: '$sender_displayname sent a video'
|
||||||
m.location: '$sender_displayname sent a location'
|
m.location: '$sender_displayname sent a location'
|
||||||
|
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
# Python logging configuration.
|
# Python logging configuration.
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ namespaces:
|
||||||
- exclusive: true
|
- exclusive: true
|
||||||
regex: '^#signal_.+:{{ matrix_mautrix_signal_homeserver_domain|regex_escape }}$'
|
regex: '^#signal_.+:{{ matrix_mautrix_signal_homeserver_domain|regex_escape }}$'
|
||||||
url: {{ matrix_mautrix_signal_appservice_address }}
|
url: {{ matrix_mautrix_signal_appservice_address }}
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_signal_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_signal_appservice_bot_username }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
de.sorunome.msc2409.push_ephemeral: true
|
de.sorunome.msc2409.push_ephemeral: true
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# mautrix-telegram is a Matrix <-> Telegram bridge
|
# mautrix-telegram is a Matrix <-> Telegram bridge
|
||||||
# See: https://github.com/tulir/mautrix-telegram
|
# See: https://github.com/mautrix/telegram
|
||||||
|
|
||||||
matrix_mautrix_telegram_enabled: true
|
matrix_mautrix_telegram_enabled: true
|
||||||
|
|
||||||
|
|
@ -10,12 +10,12 @@ matrix_telegram_lottieconverter_docker_src_files_path: "{{ matrix_base_data_path
|
||||||
matrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.14" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram
|
matrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.14" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram
|
||||||
|
|
||||||
matrix_mautrix_telegram_container_self_build: false
|
matrix_mautrix_telegram_container_self_build: false
|
||||||
matrix_mautrix_telegram_docker_repo: "https://mau.dev/tulir/mautrix-telegram.git"
|
matrix_mautrix_telegram_docker_repo: "https://mau.dev/mautrix/telegram.git"
|
||||||
matrix_mautrix_telegram_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/docker-src"
|
matrix_mautrix_telegram_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/docker-src"
|
||||||
|
|
||||||
matrix_mautrix_telegram_version: v0.9.0
|
matrix_mautrix_telegram_version: v0.9.0
|
||||||
# See: https://mau.dev/tulir/mautrix-telegram/container_registry
|
# See: https://mau.dev/mautrix/telegram/container_registry
|
||||||
matrix_mautrix_telegram_docker_image: "dock.mau.dev/tulir/mautrix-telegram:{{ matrix_mautrix_telegram_version }}"
|
matrix_mautrix_telegram_docker_image: "dock.mau.dev/mautrix/telegram:{{ matrix_mautrix_telegram_version }}"
|
||||||
matrix_mautrix_telegram_docker_image_force_pull: "{{ matrix_mautrix_telegram_docker_image.endswith(':latest') }}"
|
matrix_mautrix_telegram_docker_image_force_pull: "{{ matrix_mautrix_telegram_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
matrix_mautrix_telegram_base_path: "{{ matrix_base_data_path }}/mautrix-telegram"
|
matrix_mautrix_telegram_base_path: "{{ matrix_base_data_path }}/mautrix-telegram"
|
||||||
|
|
@ -123,7 +123,7 @@ matrix_mautrix_telegram_registration_yaml: |
|
||||||
aliases:
|
aliases:
|
||||||
- exclusive: true
|
- exclusive: true
|
||||||
regex: '^#telegram_.+:{{ matrix_mautrix_telegram_homeserver_domain|regex_escape }}$'
|
regex: '^#telegram_.+:{{ matrix_mautrix_telegram_homeserver_domain|regex_escape }}$'
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_telegram_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_telegram_appservice_bot_username }}
|
||||||
url: {{ matrix_mautrix_telegram_appservice_address }}
|
url: {{ matrix_mautrix_telegram_appservice_address }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
# mautrix-whatsapp is a Matrix <-> Whatsapp bridge
|
# mautrix-whatsapp is a Matrix <-> Whatsapp bridge
|
||||||
# See: https://github.com/tulir/mautrix-whatsapp
|
# See: https://github.com/mautrix/whatsapp
|
||||||
|
|
||||||
matrix_mautrix_whatsapp_enabled: true
|
matrix_mautrix_whatsapp_enabled: true
|
||||||
|
|
||||||
matrix_mautrix_whatsapp_version: latest
|
matrix_mautrix_whatsapp_version: latest
|
||||||
# See: https://mau.dev/tulir/mautrix-whatsapp/container_registry
|
# See: https://mau.dev/mautrix/whatsapp/container_registry
|
||||||
matrix_mautrix_whatsapp_docker_image: "dock.mau.dev/mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}"
|
matrix_mautrix_whatsapp_docker_image: "dock.mau.dev/mautrix/whatsapp:{{ matrix_mautrix_whatsapp_version }}"
|
||||||
matrix_mautrix_whatsapp_docker_image_force_pull: "{{ matrix_mautrix_whatsapp_docker_image.endswith(':latest') }}"
|
matrix_mautrix_whatsapp_docker_image_force_pull: "{{ matrix_mautrix_whatsapp_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
|
@ -96,7 +96,7 @@ matrix_mautrix_whatsapp_registration_yaml: |
|
||||||
url: {{ matrix_mautrix_whatsapp_appservice_address }}
|
url: {{ matrix_mautrix_whatsapp_appservice_address }}
|
||||||
as_token: "{{ matrix_mautrix_whatsapp_appservice_token }}"
|
as_token: "{{ matrix_mautrix_whatsapp_appservice_token }}"
|
||||||
hs_token: "{{ matrix_mautrix_whatsapp_homeserver_token }}"
|
hs_token: "{{ matrix_mautrix_whatsapp_homeserver_token }}"
|
||||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
# See https://github.com/mautrix/signal/issues/43
|
||||||
sender_localpart: _bot_{{ matrix_mautrix_whatsapp_appservice_bot_username }}
|
sender_localpart: _bot_{{ matrix_mautrix_whatsapp_appservice_bot_username }}
|
||||||
rate_limited: false
|
rate_limited: false
|
||||||
namespaces:
|
namespaces:
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,7 @@ matrix_client_element_enabled: true
|
||||||
matrix_client_element_container_image_self_build: false
|
matrix_client_element_container_image_self_build: false
|
||||||
matrix_client_element_container_image_self_build_repo: "https://github.com/vector-im/riot-web.git"
|
matrix_client_element_container_image_self_build_repo: "https://github.com/vector-im/riot-web.git"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
matrix_client_element_version: v1.8.1
|
||||||
matrix_client_element_version: v1.7.34
|
|
||||||
=======
|
|
||||||
matrix_client_element_version: v1.8.0
|
|
||||||
>>>>>>> upstream/master
|
|
||||||
matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
|
matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
|
||||||
matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
|
matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
|
||||||
matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"
|
matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn
|
||||||
matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}"
|
matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}"
|
||||||
matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
|
matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
|
||||||
|
|
||||||
matrix_coturn_version: 4.5.2-r2
|
matrix_coturn_version: 4.5.2-r3
|
||||||
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}-alpine"
|
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}-alpine"
|
||||||
matrix_coturn_docker_image_name_prefix: "{{ 'localhost/' if matrix_coturn_container_image_self_build else matrix_container_global_registry_prefix }}"
|
matrix_coturn_docker_image_name_prefix: "{{ 'localhost/' if matrix_coturn_container_image_self_build else matrix_container_global_registry_prefix }}"
|
||||||
matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
|
matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,8 @@ matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_cont
|
||||||
# amd64 gets released first.
|
# amd64 gets released first.
|
||||||
# arm32 relies on self-building, so the same version can be built immediately.
|
# arm32 relies on self-building, so the same version can be built immediately.
|
||||||
# arm64 users need to wait for a prebuilt image to become available.
|
# arm64 users need to wait for a prebuilt image to become available.
|
||||||
<<<<<<< HEAD
|
|
||||||
matrix_synapse_version: v1.39.0
|
|
||||||
matrix_synapse_version_arm64: v1.39.0
|
|
||||||
=======
|
|
||||||
matrix_synapse_version: v1.40.0
|
matrix_synapse_version: v1.40.0
|
||||||
matrix_synapse_version_arm64: v1.40.0
|
matrix_synapse_version_arm64: v1.40.0
|
||||||
>>>>>>> upstream/master
|
|
||||||
matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
|
matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
|
||||||
matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
|
matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
|
@ -458,10 +453,7 @@ matrix_synapse_replication_http_port: 9093
|
||||||
matrix_synapse_sentry_dsn: ""
|
matrix_synapse_sentry_dsn: ""
|
||||||
|
|
||||||
# Postgres database information
|
# Postgres database information
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
matrix_synapse_database_txn_limit: 0
|
matrix_synapse_database_txn_limit: 0
|
||||||
>>>>>>> upstream/master
|
|
||||||
matrix_synapse_database_host: "matrix-postgres"
|
matrix_synapse_database_host: "matrix-postgres"
|
||||||
matrix_synapse_database_port: 5432
|
matrix_synapse_database_port: 5432
|
||||||
matrix_synapse_database_user: "synapse"
|
matrix_synapse_database_user: "synapse"
|
||||||
|
|
|
||||||
|
|
@ -732,11 +732,6 @@ caches:
|
||||||
|
|
||||||
## Database ##
|
## Database ##
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
database:
|
|
||||||
# The database engine name
|
|
||||||
name: "psycopg2"
|
|
||||||
=======
|
|
||||||
# The 'database' setting defines the database that synapse uses to store all of
|
# The 'database' setting defines the database that synapse uses to store all of
|
||||||
# its data.
|
# its data.
|
||||||
#
|
#
|
||||||
|
|
@ -783,7 +778,6 @@ database:
|
||||||
# The database engine name
|
# The database engine name
|
||||||
name: "psycopg2"
|
name: "psycopg2"
|
||||||
txn_limit: {{ matrix_synapse_database_txn_limit }}
|
txn_limit: {{ matrix_synapse_database_txn_limit }}
|
||||||
>>>>>>> upstream/master
|
|
||||||
args:
|
args:
|
||||||
user: {{ matrix_synapse_database_user|string|to_json }}
|
user: {{ matrix_synapse_database_user|string|to_json }}
|
||||||
password: {{ matrix_synapse_database_password|string|to_json }}
|
password: {{ matrix_synapse_database_password|string|to_json }}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue