Merge branch 'master' into synapse-workers

docs/configuring-playbook-bridge-appservice-discord.md

@@ -38,8 +38,9 @@ To [adjust room access privileges](#adjusting-room-access-privileges) or do vari
 
 There's the Discord bridge's guide for [setting privileges on bridge managed rooms](https://github.com/Half-Shot/matrix-appservice-discord/blob/master/docs/howto.md#set-privileges-on-bridge-managed-rooms). To do the same with our container setup, run the following command on the server:
 
-```
+```sh
-docker exec -it matrix-appservice-discord /bin/sh -c 'cp /build/tools/adminme.js /tmp/adminme.js && cp /cfg/registration.yaml /tmp/discord-registration.yaml && cd /tmp && node /tmp/adminme.js -c /cfg/config.yaml -r "!ROOM_ID:SERVER" -u "@USER:SERVER" -p 100'
+docker exec -it matrix-appservice-discord \
+/bin/sh -c 'cp /cfg/registration.yaml /tmp/discord-registration.yaml && cd /tmp && node /build/tools/adminme.js -c /cfg/config.yaml -m "!ROOM_ID:SERVER" -u "@USER:SERVER" -p 100'
 ```
 
 

docs/configuring-playbook.md

@@ -33,7 +33,7 @@ When you're done with all the configuration you'd like to do, continue with [Ins
 
 - [Setting up the Jitsi video-conferencing platform](configuring-playbook-jitsi.md) (optional)
 
-- [Setting Dynamic DNS](configuring-playbook-dynamic-dns.md) (optional)
+- [Setting up Dynamic DNS](configuring-playbook-dynamic-dns.md) (optional)
 
 ### Core service adjustments
 

docs/installing.md

@@ -36,11 +36,19 @@ When you're ready to start the Matrix services (and set them up to auto-start in
 ansible-playbook -i inventory/hosts setup.yml --tags=start
 ```
 
-Now that the services are running, you might want to:
+Now that services are running, you need to **finalize the installation process** (required for federation to work!) by [Configuring Service Discovery via .well-known](configuring-well-known.md)
-
+
-- **finalize the installation process** (required for federation to work!) by [Configuring Service Discovery via .well-known](configuring-well-known.md)
+
-- or [create your first user account](registering-users.md)
+## Things to do next
-- or [set up the Dimension Integrations Manager](configuring-playbook-dimension.md)
+
-- or [check if services work](maintenance-checking-services.md)
+If you have started services and **finalized the installation process** (required for federation to work!) by [Configuring Service Discovery via .well-known](configuring-well-known.md), you can:
-- or learn how to [upgrade your services when new versions are released](maintenance-upgrading-services.md)
+
-- or learn how to [migrate to another server](maintenance-migrating.md)
+- [check if services work](maintenance-checking-services.md)
+- or [create your first Matrix user account](registering-users.md)
+- or [set up additional services](configuring-playbook.md#other-configuration-options) (bridges to other chat networks, bots, etc.)
+- or learn how to [upgrade services when new versions are released](maintenance-upgrading-services.md)
+- or learn how to [maintain your server](faq.md#maintenance)
+- or join some Matrix rooms:
+  * via the *Explore rooms* feature in Element or some other client, or by discovering them using this [matrix-static list](https://view.matrix.org). Note: joining large rooms may overload small servers.
+  * or come say Hi in our support room - [#matrix-docker-ansible-deploy:devture.com](https://matrix.to/#/#matrix-docker-ansible-deploy:devture.com). You might learn something or get to help someone else new to Matrix hosting.
+- or help make this playbook better by contributing (code, documentation, or [coffee/beer](https://liberapay.com/s.pantaleev/donate))

roles/matrix-bridge-appservice-discord/templates/config.yaml.j2

@@ -1,10 +1,10 @@
 #jinja2: lstrip_blocks: "True"
 bridge:
   # Domain part of the bridge, e.g. matrix.org
-  domain: {{ matrix_appservice_discord_bridge_domain }}
+  domain: {{ matrix_appservice_discord_bridge_domain|to_json }}
   # This should be your publically facing URL because Discord may use it to
   # fetch media from the media store.
-  homeserverUrl: {{ matrix_appservice_discord_bridge_homeserverUrl }}
+  homeserverUrl: {{ matrix_appservice_discord_bridge_homeserverUrl|to_json }}
   # Interval at which to process users in the 'presence queue'. If you have
   # 5 users, one user will be processed every 500 milliseconds according to the
   # value below. This has a minimum value of 250.
@@ -33,7 +33,7 @@ bridge:
 # Authentication configuration for the discord bot.
 auth:
   clientID: {{ matrix_appservice_discord_client_id|string|to_json }}
-  botToken: {{ matrix_appservice_discord_bot_token }}
+  botToken: {{ matrix_appservice_discord_bot_token|to_json }}
   # You must enable "Privileged Gateway Intents" in your bot settings on discord.com (e.g. https://discord.com/developers/applications/12345/bot)
   # for this to work
   usePrivilegedIntents: {{ matrix_appservice_discord_auth_usePrivilegedIntents|to_json }}

roles/matrix-bridge-mautrix-telegram/templates/config.yaml.j2

@@ -13,7 +13,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_telegram_appservice_address }}
+    address: {{ matrix_mautrix_telegram_appservice_address|to_json }}
 
     # The hostname and port where this appservice should listen.
     hostname: 0.0.0.0
@@ -36,10 +36,10 @@ appservice:
         # Whether or not the public-facing endpoints should be enabled.
         enabled: true
         # The prefix to use in the public-facing endpoints.
-        prefix: {{ matrix_mautrix_telegram_public_endpoint }}
+        prefix: {{ matrix_mautrix_telegram_public_endpoint|to_json }}
         # The base URL where the public-facing endpoints are available. The prefix is not added
         # implicitly.
-        external: {{ matrix_mautrix_telegram_appservice_public_external }}
+        external: {{ matrix_mautrix_telegram_appservice_public_external|to_json }}
 
     # Provisioning API part of the web server for automated portal creation and fetching information.
     # Used by things like Dimension (https://dimension.t2bot.io/).
@@ -62,8 +62,8 @@ appservice:
     bot_avatar: mxc://maunium.net/tJCRmUyJDsgRNgqhOgoiHWbX
 
     # Authentication tokens for AS <-> HS communication.
-    as_token: "{{ matrix_mautrix_telegram_appservice_token }}"
+    as_token: {{ matrix_mautrix_telegram_appservice_token|to_json }}
-    hs_token: "{{ matrix_mautrix_telegram_homeserver_token }}"
+    hs_token: {{ matrix_mautrix_telegram_homeserver_token|to_json }}
 
 # Bridge config
 bridge:
@@ -330,10 +330,10 @@ bridge:
 # Telegram config
 telegram:
     # Get your own API keys at https://my.telegram.org/apps
-    api_id: {{ matrix_mautrix_telegram_api_id }}
+    api_id: {{ matrix_mautrix_telegram_api_id|to_json }}
-    api_hash: {{ matrix_mautrix_telegram_api_hash }}
+    api_hash: {{ matrix_mautrix_telegram_api_hash|to_json }}
     # (Optional) Create your own bot at https://t.me/BotFather
-    bot_token: {{ matrix_mautrix_telegram_bot_token }}
+    bot_token: {{ matrix_mautrix_telegram_bot_token|to_json }}
 
     # Telethon connection options.
     connection: