From 0261e247e33b46afa985cebe0889afec4b2f85f5 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:23:06 +0900 Subject: [PATCH 01/37] Replace YOUR_DOMAIN with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-go-neb.md | 2 +- docs/configuring-playbook-bot-matrix-reminder-bot.md | 2 +- ...configuring-playbook-bridge-appservice-discord.md | 2 +- docs/configuring-playbook-bridge-appservice-irc.md | 2 +- ...nfiguring-playbook-bridge-appservice-kakaotalk.md | 2 +- docs/configuring-playbook-bridge-beeper-linkedin.md | 4 ++-- docs/configuring-playbook-bridge-go-skype-bridge.md | 2 +- docs/configuring-playbook-bridge-mautrix-discord.md | 2 +- docs/configuring-playbook-bridge-mautrix-facebook.md | 2 +- .../configuring-playbook-bridge-mautrix-gmessages.md | 2 +- ...configuring-playbook-bridge-mautrix-googlechat.md | 2 +- docs/configuring-playbook-bridge-mautrix-hangouts.md | 2 +- .../configuring-playbook-bridge-mautrix-instagram.md | 4 ++-- ...iguring-playbook-bridge-mautrix-meta-instagram.md | 12 ++++++------ ...iguring-playbook-bridge-mautrix-meta-messenger.md | 10 +++++----- docs/configuring-playbook-bridge-mautrix-signal.md | 10 +++++----- docs/configuring-playbook-bridge-mautrix-slack.md | 2 +- docs/configuring-playbook-bridge-mautrix-telegram.md | 2 +- docs/configuring-playbook-bridge-mautrix-twitter.md | 2 +- docs/configuring-playbook-bridge-mautrix-whatsapp.md | 2 +- .../configuring-playbook-bridge-mx-puppet-discord.md | 2 +- .../configuring-playbook-bridge-mx-puppet-groupme.md | 2 +- ...onfiguring-playbook-bridge-mx-puppet-instagram.md | 2 +- docs/configuring-playbook-bridge-mx-puppet-slack.md | 2 +- docs/configuring-playbook-bridge-mx-puppet-steam.md | 2 +- .../configuring-playbook-bridge-mx-puppet-twitter.md | 2 +- docs/configuring-playbook-bridge-wechat.md | 2 +- docs/configuring-playbook-mautrix-bridges.md | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/configuring-playbook-bot-go-neb.md b/docs/configuring-playbook-bot-go-neb.md index 0baa972e4..911a20839 100644 --- a/docs/configuring-playbook-bot-go-neb.md +++ b/docs/configuring-playbook-bot-go-neb.md @@ -225,7 +225,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ## Usage -To use the bot, invite it to any existing Matrix room (`/invite @whatever_you_chose:DOMAIN` where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain, make sure you have permission from the room owner if that's not you). +To use the bot, invite it to any existing Matrix room (`/invite @whatever_you_chose:example.com` where `example.com` is your base domain, not the `matrix.` domain, make sure you have permission from the room owner if that's not you). Basic usage is like this: `!echo hi` or `!imgur puppies` or `!giphy matrix` diff --git a/docs/configuring-playbook-bot-matrix-reminder-bot.md b/docs/configuring-playbook-bot-matrix-reminder-bot.md index 7f5bbf1f1..3336d191a 100644 --- a/docs/configuring-playbook-bot-matrix-reminder-bot.md +++ b/docs/configuring-playbook-bot-matrix-reminder-bot.md @@ -42,7 +42,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use ## Usage -To use the bot, start a chat with `@bot.matrix-reminder-bot:DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +To use the bot, start a chat with `@bot.matrix-reminder-bot:DOMAIN` (where `example.com` is your base domain, not the `matrix.` domain). You can also add the bot to any existing Matrix room (`/invite @bot.matrix-reminder-bot:DOMAIN`). diff --git a/docs/configuring-playbook-bridge-appservice-discord.md b/docs/configuring-playbook-bridge-appservice-discord.md index 12370ad11..8ee106d1f 100644 --- a/docs/configuring-playbook-bridge-appservice-discord.md +++ b/docs/configuring-playbook-bridge-appservice-discord.md @@ -46,7 +46,7 @@ matrix_appservice_discord_bridge_enableSelfServiceBridging: true Once self-service is enabled: -1. Start a chat with `@_discord_bot:` and say `!discord help bridge`. +1. Start a chat with `@_discord_bot:` and say `!discord help bridge`. 2. Follow the instructions in the help output message. If the bot is not already in the Discord server, follow the provided invite link. This may require you to be a administrator of the Discord server. **Note**: Encrypted Matrix rooms are not supported as of writing. diff --git a/docs/configuring-playbook-bridge-appservice-irc.md b/docs/configuring-playbook-bridge-appservice-irc.md index 2dddbf16d..4da559790 100644 --- a/docs/configuring-playbook-bridge-appservice-irc.md +++ b/docs/configuring-playbook-bridge-appservice-irc.md @@ -66,4 +66,4 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -You then need to start a chat with `@irc_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@irc_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). diff --git a/docs/configuring-playbook-bridge-appservice-kakaotalk.md b/docs/configuring-playbook-bridge-appservice-kakaotalk.md index 3c90182a1..4a004eb1a 100644 --- a/docs/configuring-playbook-bridge-appservice-kakaotalk.md +++ b/docs/configuring-playbook-bridge-appservice-kakaotalk.md @@ -63,7 +63,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -Start a chat with `@kakaotalkbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +Start a chat with `@kakaotalkbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login --save EMAIL_OR_PHONE_NUMBER` to the bridge bot to enable bridging for your Kakaotalk account. The `--save` flag may be omitted, if you'd rather not save your password. diff --git a/docs/configuring-playbook-bridge-beeper-linkedin.md b/docs/configuring-playbook-bridge-beeper-linkedin.md index cb3a5266c..3aaa01520 100644 --- a/docs/configuring-playbook-bridge-beeper-linkedin.md +++ b/docs/configuring-playbook-bridge-beeper-linkedin.md @@ -28,7 +28,7 @@ If you would like to be able to administrate the bridge from your account it can matrix_beeper_linkedin_configuration_extension_yaml: | bridge: permissions: - '@YOUR_USERNAME:YOUR_DOMAIN': admin + '@YOUR_USERNAME:example.com': admin ``` You may wish to look at `roles/custom/matrix-bridge-beeper-linkedin/templates/config.yaml.j2` to find other things you would like to configure. @@ -48,7 +48,7 @@ Enabling double puppeting by enabling the [Shared Secret Auth](configuring-playb ## Usage -You then need to start a chat with `@linkedinbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@linkedinbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login YOUR_LINKEDIN_EMAIL_ADDRESS` to the bridge bot to enable bridging for your LinkedIn account. diff --git a/docs/configuring-playbook-bridge-go-skype-bridge.md b/docs/configuring-playbook-bridge-go-skype-bridge.md index 799a1dd4d..c9001636a 100644 --- a/docs/configuring-playbook-bridge-go-skype-bridge.md +++ b/docs/configuring-playbook-bridge-go-skype-bridge.md @@ -20,7 +20,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled, you need to start a chat with `Skype bridge bot` -with the handle `@skypebridgebot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +with the handle `@skypebridgebot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `help` to the bot to see the commands available. diff --git a/docs/configuring-playbook-bridge-mautrix-discord.md b/docs/configuring-playbook-bridge-mautrix-discord.md index 6c25b8652..184addf6b 100644 --- a/docs/configuring-playbook-bridge-mautrix-discord.md +++ b/docs/configuring-playbook-bridge-mautrix-discord.md @@ -87,7 +87,7 @@ To acquire the token, open Discord in a private browser window. Then open the de ### Bridging -1. Start a chat with `@discordbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +1. Start a chat with `@discordbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). 2. If you would like to login to Discord using a token, send `login-token` command, otherwise, send `login-qr` command. 3. You'll see a QR code which you need to scan with the Discord app on your phone. You can scan it with the camera app too, which will open Discord, which will then instruct you to scan it a 2nd time in the Discord app. 4. After confirming (in the Discord app) that you'd like to allow this login, the bot should respond with "Succcessfully authenticated as ..." diff --git a/docs/configuring-playbook-bridge-mautrix-facebook.md b/docs/configuring-playbook-bridge-mautrix-facebook.md index 0b3ef7928..e20d1e2e6 100644 --- a/docs/configuring-playbook-bridge-mautrix-facebook.md +++ b/docs/configuring-playbook-bridge-mautrix-facebook.md @@ -76,7 +76,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@facebookbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@facebookbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login YOUR_FACEBOOK_EMAIL_ADDRESS` to the bridge bot to enable bridging for your Facebook Messenger account. You can learn more here about authentication from the bridge's [official documentation on Authentication](https://docs.mau.fi/bridges/python/facebook/authentication.html). diff --git a/docs/configuring-playbook-bridge-mautrix-gmessages.md b/docs/configuring-playbook-bridge-mautrix-gmessages.md index ffad8b0b3..e07646743 100644 --- a/docs/configuring-playbook-bridge-mautrix-gmessages.md +++ b/docs/configuring-playbook-bridge-mautrix-gmessages.md @@ -41,4 +41,4 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@gmessagesbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@gmessagesbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). diff --git a/docs/configuring-playbook-bridge-mautrix-googlechat.md b/docs/configuring-playbook-bridge-mautrix-googlechat.md index f326763ed..ed6270c8a 100644 --- a/docs/configuring-playbook-bridge-mautrix-googlechat.md +++ b/docs/configuring-playbook-bridge-mautrix-googlechat.md @@ -44,7 +44,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -Once the bot is enabled you need to start a chat with `googlechat bridge bot` with handle `@googlechatbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +Once the bot is enabled you need to start a chat with `googlechat bridge bot` with handle `@googlechatbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login` to the bridge bot to receive a link to the portal from which you can enable the bridging. Open the link sent by the bot and follow the instructions. diff --git a/docs/configuring-playbook-bridge-mautrix-hangouts.md b/docs/configuring-playbook-bridge-mautrix-hangouts.md index 6cd88746c..62770fe0b 100644 --- a/docs/configuring-playbook-bridge-mautrix-hangouts.md +++ b/docs/configuring-playbook-bridge-mautrix-hangouts.md @@ -44,7 +44,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -Once the bot is enabled you need to start a chat with `Hangouts bridge bot` with handle `@hangoutsbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +Once the bot is enabled you need to start a chat with `Hangouts bridge bot` with handle `@hangoutsbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login` to the bridge bot to receive a link to the portal from which you can enable the bridging. Open the link sent by the bot and follow the instructions. diff --git a/docs/configuring-playbook-bridge-mautrix-instagram.md b/docs/configuring-playbook-bridge-mautrix-instagram.md index 34ae70b12..14d25f52f 100644 --- a/docs/configuring-playbook-bridge-mautrix-instagram.md +++ b/docs/configuring-playbook-bridge-mautrix-instagram.md @@ -35,7 +35,7 @@ matrix_admin: "@YOUR_USERNAME:{{ matrix_domain }}" matrix_mautrix_instagram_configuration_extension_yaml: | bridge: permissions: - '@YOUR_USERNAME:YOUR_DOMAIN': admin + '@YOUR_USERNAME:example.com': admin ``` You may wish to look at `roles/custom/matrix-bridge-mautrix-instagram/templates/config.yaml.j2` and `roles/custom/matrix-bridge-mautrix-instagram/defaults/main.yml` to find other things you would like to configure. @@ -46,7 +46,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -You then need to start a chat with `@instagrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@instagrambot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login YOUR_INSTAGRAM_EMAIL_ADDRESS YOUR_INSTAGRAM_PASSWORD` to the bridge bot to enable bridging for your instagram/Messenger account. diff --git a/docs/configuring-playbook-bridge-mautrix-meta-instagram.md b/docs/configuring-playbook-bridge-mautrix-meta-instagram.md index aa0160858..0a644d049 100644 --- a/docs/configuring-playbook-bridge-mautrix-meta-instagram.md +++ b/docs/configuring-playbook-bridge-mautrix-meta-instagram.md @@ -11,10 +11,10 @@ This documentation page only deals with the bridge's ability to bridge to Instag If you've been using the [mautrix-instagram](./configuring-playbook-bridge-mautrix-instagram.md) bridge, **you'd better get rid of it first** or the 2 bridges will be in conflict: -- both trying to use `@instagrambot:YOUR_DOMAIN` as their username. This conflict may be resolved by adjusting `matrix_mautrix_instagram_appservice_bot_username` or `matrix_mautrix_meta_instagram_appservice_username` +- both trying to use `@instagrambot:example.com` as their username. This conflict may be resolved by adjusting `matrix_mautrix_instagram_appservice_bot_username` or `matrix_mautrix_meta_instagram_appservice_username` - both trying to bridge the same DMs -To do so, send a `clean-rooms` command to the management room with the old bridge bot (`@instagrambot:YOUR_DOMAIN`). +To do so, send a `clean-rooms` command to the management room with the old bridge bot (`@instagrambot:example.com`). This would give you a list of portals and groups of portals you may purge. Proceed with sending commands like `clean recommended`, etc. @@ -47,17 +47,17 @@ The default permissions are set via `matrix_mautrix_meta_instagram_bridge_permis ```yaml matrix_mautrix_meta_instagram_bridge_permissions_default: '*': relay - YOUR_DOMAIN: user + example.com: user '{{ matrix_admin }}': admin ``` -If you don't define the `matrix_admin` in your configuration (e.g. `matrix_admin: @user:YOUR_DOMAIN`), then there's no admin by default. +If you don't define the `matrix_admin` in your configuration (e.g. `matrix_admin: @user:example.com`), then there's no admin by default. You may redefine `matrix_mautrix_meta_instagram_bridge_permissions_default` any way you see fit, or add extra permissions using `matrix_mautrix_meta_instagram_bridge_permissions_custom` like this: ```yaml matrix_mautrix_meta_instagram_bridge_permissions_custom: - '@YOUR_USERNAME:YOUR_DOMAIN': admin + '@YOUR_USERNAME:example.com': admin ``` You may wish to look at `roles/custom/matrix-bridge-mautrix-meta-instagram/templates/config.yaml.j2` to find more information on the permissions settings and other options you would like to configure. @@ -91,4 +91,4 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@instagrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@instagrambot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). diff --git a/docs/configuring-playbook-bridge-mautrix-meta-messenger.md b/docs/configuring-playbook-bridge-mautrix-meta-messenger.md index 952a7d6f8..ded925ce5 100644 --- a/docs/configuring-playbook-bridge-mautrix-meta-messenger.md +++ b/docs/configuring-playbook-bridge-mautrix-meta-messenger.md @@ -11,7 +11,7 @@ This documentation page only deals with the bridge's ability to bridge to Facebo If you've been using the [mautrix-facebook](./configuring-playbook-bridge-mautrix-facebook.md) bridge, it's possible to migrate the database using [instructions from the bridge documentation](https://docs.mau.fi/bridges/go/meta/facebook-migration.html) (advanced). -Then you may wish to get rid of the Facebook bridge. To do so, send a `clean-rooms` command to the management room with the old bridge bot (`@facebookbot:YOUR_DOMAIN`). +Then you may wish to get rid of the Facebook bridge. To do so, send a `clean-rooms` command to the management room with the old bridge bot (`@facebookbot:example.com`). This would give you a list of portals and groups of portals you may purge. Proceed with sending commands like `clean recommended`, etc. @@ -57,17 +57,17 @@ The default permissions are set via `matrix_mautrix_meta_messenger_bridge_permis ```yaml matrix_mautrix_meta_messenger_bridge_permissions_default: '*': relay - YOUR_DOMAIN: user + example.com: user '{{ matrix_admin }}': admin ``` -If you don't define the `matrix_admin` in your configuration (e.g. `matrix_admin: @user:YOUR_DOMAIN`), then there's no admin by default. +If you don't define the `matrix_admin` in your configuration (e.g. `matrix_admin: @user:example.com`), then there's no admin by default. You may redefine `matrix_mautrix_meta_messenger_bridge_permissions_default` any way you see fit, or add extra permissions using `matrix_mautrix_meta_messenger_bridge_permissions_custom` like this: ```yaml matrix_mautrix_meta_messenger_bridge_permissions_custom: - '@YOUR_USERNAME:YOUR_DOMAIN': admin + '@YOUR_USERNAME:example.com': admin ``` You may wish to look at `roles/custom/matrix-bridge-mautrix-meta-messenger/templates/config.yaml.j2` to find more information on the permissions settings and other options you would like to configure. @@ -101,7 +101,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@messengerbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@messengerbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). You then need to send a `login` command and follow the bridge bot's instructions. diff --git a/docs/configuring-playbook-bridge-mautrix-signal.md b/docs/configuring-playbook-bridge-mautrix-signal.md index dacdce37f..16227a186 100644 --- a/docs/configuring-playbook-bridge-mautrix-signal.md +++ b/docs/configuring-playbook-bridge-mautrix-signal.md @@ -32,7 +32,7 @@ The default permissions are set as follows: ```yaml permissions: '*': relay - YOUR_DOMAIN: user + example.com: 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: @@ -40,7 +40,7 @@ If you want to augment the preset permissions, you might want to set the additio matrix_mautrix_signal_configuration_extension_yaml: | bridge: permissions: - '@YOUR_USERNAME:YOUR_DOMAIN': admin + '@YOUR_USERNAME:example.com': admin ``` This will add the admin permission to the specific user, while keeping the default permissions. @@ -48,8 +48,8 @@ This will add the admin permission to the specific user, while keeping the defau 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 + '@ADMIN:example.com': admin + '@USER:example.com' : user ``` You may wish to look at `roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2` to find more information on the permissions settings and other options you would like to configure. @@ -83,4 +83,4 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@signalbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@signalbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). diff --git a/docs/configuring-playbook-bridge-mautrix-slack.md b/docs/configuring-playbook-bridge-mautrix-slack.md index 5ce1bdcaa..e2f00d467 100644 --- a/docs/configuring-playbook-bridge-mautrix-slack.md +++ b/docs/configuring-playbook-bridge-mautrix-slack.md @@ -74,7 +74,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -1. Start a chat with `@slackbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +1. Start a chat with `@slackbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). 2. If you would like to login to Slack using a token, send the `login-token` command, otherwise, send the `login-password` command. Read [here](https://docs.mau.fi/bridges/go/slack/authentication.html) on how to retrieve your token and cookie token. 3. The bot should respond with "Successfully logged into for team " 4. Now that you're logged in, you can send a `help` command to the bot again, to see additional commands you have access to. diff --git a/docs/configuring-playbook-bridge-mautrix-telegram.md b/docs/configuring-playbook-bridge-mautrix-telegram.md index 82eb6ba52..a556dcffa 100644 --- a/docs/configuring-playbook-bridge-mautrix-telegram.md +++ b/docs/configuring-playbook-bridge-mautrix-telegram.md @@ -45,7 +45,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -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:example.com` (where `example.com` is your base domain, not the `matrix.` domain). 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, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: diff --git a/docs/configuring-playbook-bridge-mautrix-twitter.md b/docs/configuring-playbook-bridge-mautrix-twitter.md index 0925cf1b2..60c1a745f 100644 --- a/docs/configuring-playbook-bridge-mautrix-twitter.md +++ b/docs/configuring-playbook-bridge-mautrix-twitter.md @@ -36,7 +36,7 @@ This method is currently not available for the Mautrix-Twitter bridge, but is on ## Usage -1. You then need to start a chat with `@twitterbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +1. You then need to start a chat with `@twitterbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). 2. Send login-cookie to start the login. The bot should respond with instructions on how to proceed. You can learn more here about authentication from the bridge's [official documentation on Authentication](https://docs.mau.fi/bridges/python/twitter/authentication.html). diff --git a/docs/configuring-playbook-bridge-mautrix-whatsapp.md b/docs/configuring-playbook-bridge-mautrix-whatsapp.md index d9cabaa27..ae1d2ea3a 100644 --- a/docs/configuring-playbook-bridge-mautrix-whatsapp.md +++ b/docs/configuring-playbook-bridge-mautrix-whatsapp.md @@ -58,4 +58,4 @@ When using this method, **each user** that wishes to enable Double Puppeting nee ## Usage -You then need to start a chat with `@whatsappbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@whatsappbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). diff --git a/docs/configuring-playbook-bridge-mx-puppet-discord.md b/docs/configuring-playbook-bridge-mx-puppet-discord.md index d56bf89fb..da987bf2e 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-discord.md +++ b/docs/configuring-playbook-bridge-mx-puppet-discord.md @@ -26,7 +26,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled you need to start a chat with `Discord Puppet Bridge` with -the handle `@_discordpuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_discordpuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Three authentication methods are available, Legacy Token, OAuth and xoxc token. diff --git a/docs/configuring-playbook-bridge-mx-puppet-groupme.md b/docs/configuring-playbook-bridge-mx-puppet-groupme.md index 37e22ead2..ed38600e4 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-groupme.md +++ b/docs/configuring-playbook-bridge-mx-puppet-groupme.md @@ -20,7 +20,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled you need to start a chat with `GroupMe Puppet Bridge` with -the handle `@_groupmepuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_groupmepuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). One authentication method is available. diff --git a/docs/configuring-playbook-bridge-mx-puppet-instagram.md b/docs/configuring-playbook-bridge-mx-puppet-instagram.md index dba9b27df..0a61d561f 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-instagram.md +++ b/docs/configuring-playbook-bridge-mx-puppet-instagram.md @@ -20,7 +20,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled, you need to start a chat with `Instagram Puppet Bridge` with -the handle `@_instagrampuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_instagrampuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `link ` to the bridge bot to link your instagram account. diff --git a/docs/configuring-playbook-bridge-mx-puppet-slack.md b/docs/configuring-playbook-bridge-mx-puppet-slack.md index 3f0607513..a2e2fa3c3 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-slack.md +++ b/docs/configuring-playbook-bridge-mx-puppet-slack.md @@ -34,7 +34,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ## Usage Once the bot is enabled you need to start a chat with `Slack Puppet Bridge` with -the handle `@_slackpuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_slackpuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Three authentication methods are available, Legacy Token, OAuth and xoxc token. diff --git a/docs/configuring-playbook-bridge-mx-puppet-steam.md b/docs/configuring-playbook-bridge-mx-puppet-steam.md index e5338b1c7..08b254259 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-steam.md +++ b/docs/configuring-playbook-bridge-mx-puppet-steam.md @@ -20,7 +20,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled you need to start a chat with `Steam Puppet Bridge` with -the handle `@_steampuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_steampuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Three authentication methods are available, Legacy Token, OAuth and xoxc token. diff --git a/docs/configuring-playbook-bridge-mx-puppet-twitter.md b/docs/configuring-playbook-bridge-mx-puppet-twitter.md index 74b35092d..0d567c56e 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-twitter.md +++ b/docs/configuring-playbook-bridge-mx-puppet-twitter.md @@ -31,7 +31,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage Once the bot is enabled you need to start a chat with `Twitter Puppet Bridge` with -the handle `@_twitterpuppet_bot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base +the handle `@_twitterpuppet_bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). To log in, use `link` and click the link. diff --git a/docs/configuring-playbook-bridge-wechat.md b/docs/configuring-playbook-bridge-wechat.md index c6891de15..c00b9a7fc 100644 --- a/docs/configuring-playbook-bridge-wechat.md +++ b/docs/configuring-playbook-bridge-wechat.md @@ -18,6 +18,6 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -Once the bridge is installed, start a chat with `@wechatbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +Once the bridge is installed, start a chat with `@wechatbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `help` to the bot to see the available commands. diff --git a/docs/configuring-playbook-mautrix-bridges.md b/docs/configuring-playbook-mautrix-bridges.md index bffeeff8d..ddb935809 100644 --- a/docs/configuring-playbook-mautrix-bridges.md +++ b/docs/configuring-playbook-mautrix-bridges.md @@ -121,7 +121,7 @@ If you have issues with a service, and are requesting support, the higher levels ## Usage -You then need to start a chat with `@SERVICENAMEbot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). +You then need to start a chat with `@SERVICENAMEbot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). Send `login ` to the bridge bot to get started You can learn more here about authentication from the bridge's official documentation on Authentication https://docs.mau.fi/bridges/python/SERVICENAME/authentication.html . From 59dd88967167625fe7a04214204219b29a44a9b5 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:23:55 +0900 Subject: [PATCH 02/37] Replace with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bridge-appservice-discord.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-bridge-appservice-discord.md b/docs/configuring-playbook-bridge-appservice-discord.md index 8ee106d1f..49834bd42 100644 --- a/docs/configuring-playbook-bridge-appservice-discord.md +++ b/docs/configuring-playbook-bridge-appservice-discord.md @@ -46,7 +46,7 @@ matrix_appservice_discord_bridge_enableSelfServiceBridging: true Once self-service is enabled: -1. Start a chat with `@_discord_bot:` and say `!discord help bridge`. +1. Start a chat with `@_discord_bot:example.com` and say `!discord help bridge`. 2. Follow the instructions in the help output message. If the bot is not already in the Discord server, follow the provided invite link. This may require you to be a administrator of the Discord server. **Note**: Encrypted Matrix rooms are not supported as of writing. From 7779b747ea466acad9e39f25a6cd88b1fbbe6e9b Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 10 Oct 2024 22:15:01 +0900 Subject: [PATCH 03/37] =?UTF-8?q?Edit=20user=20identifier=20example=20(dom?= =?UTF-8?q?ain.com=20=E2=86=92=20example.com)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-baibot.md | 2 +- docs/configuring-playbook-bot-postmoogle.md | 4 ++-- docs/faq.md | 6 +++--- docs/updating-users-passwords.md | 4 ++-- examples/reverse-proxies/nginx/README.md | 2 +- roles/custom/matrix-bot-chatgpt/defaults/main.yml | 2 +- roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 | 2 +- roles/custom/matrix-dimension/defaults/main.yml | 2 +- .../matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/configuring-playbook-bot-baibot.md b/docs/configuring-playbook-bot-baibot.md index 1832ef42b..e13c9c81e 100644 --- a/docs/configuring-playbook-bot-baibot.md +++ b/docs/configuring-playbook-bot-baibot.md @@ -93,7 +93,7 @@ If `matrix_admin` is already configured in your `vars.yml` configuration, you ca # # .. unless you've made yourself an admin of all bots/bridges like this: # -# matrix_admin: '@yourAdminAccount:domain.com' +# matrix_admin: '@yourAdminAccount:example.com' ``` ### 👥 Initial users configuration diff --git a/docs/configuring-playbook-bot-postmoogle.md b/docs/configuring-playbook-bot-postmoogle.md index 4a794f9b9..8674a8641 100644 --- a/docs/configuring-playbook-bot-postmoogle.md +++ b/docs/configuring-playbook-bot-postmoogle.md @@ -39,11 +39,11 @@ matrix_bot_postmoogle_password: PASSWORD_FOR_THE_BOT # Uncomment to add one or more admins to this bridge: # # matrix_bot_postmoogle_admins: -# - '@yourAdminAccount:domain.com' +# - '@yourAdminAccount:example.com' # # .. unless you've made yourself an admin of all bots/bridges like this: # -# matrix_admin: '@yourAdminAccount:domain.com' +# matrix_admin: '@yourAdminAccount:example.com' ``` ### DNS diff --git a/docs/faq.md b/docs/faq.md index d0cc9d8c1..50dcdaaf6 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -25,11 +25,11 @@ You don't just use the "email" protocols (SMTP, POP3, IMAP) directly though. The In the world of the Matrix chat protocol, there are various client programs. The first and currently most full-featured one is called [Element](https://element.io/) (used to be called Riot.im and Vector.im in the past). There are [many other clients](https://matrix.org/clients/). You can switch clients as much as you want until you find the one that is right for you on a given platform (you may use Element on your desktop, but Fluffychat on your phone, etc). -Matrix is also like email due to the fact that there are many servers around the world which can all talk to each other (you can send email from `@gmail.com` addresses to `@yahoo.com` and `@hotmail.com` addresses). It's the same with Matrix (`@bob:his-domain.com` can talk to `@alice:her-domain.org`). +Matrix is also like email due to the fact that there are many servers around the world which can all talk to each other (you can send email from `@gmail.com` addresses to `@yahoo.com` and `@hotmail.com` addresses). It's the same with Matrix (`@bob:example.com` can talk to `@alice:example.org`). If someone else is hosting your Matrix server (you being `@user:matrix.org` or some other public server like this), all you need is a Matrix client program, like Element. -If you'd like to host your own server (you being `@user:your-own-domain.com`), you'd need to set up a Matrix server program, like Synapse. +If you'd like to host your own server (you being `@user:example.com`), you'd need to set up a Matrix server program, like Synapse. In short: @@ -57,7 +57,7 @@ There are 3 ways to get into Matrix, depending on your technical ability and nee - **using some other server** - instead of using the largest public server (`matrix.org`), you can use another public one. Here's a [list of public Matrix servers](https://joinmatrix.org/servers/) to choose from. Again, you download [Element](https://element.io) or [some other client](https://matrix.org/clients/) of your choosing and adjust the homeserver URL during login. -- **using your own server** - running your own server puts you in ultimate control of your data. It also lets you have your own user identifiers (e.g. `@bob:your-domain.com`). See [How do I set up my own Matrix server](#how-do-i-set-up-my-own-matrix-server). +- **using your own server** - running your own server puts you in ultimate control of your data. It also lets you have your own user identifiers (e.g. `@bob:example.com`). See [How do I set up my own Matrix server](#how-do-i-set-up-my-own-matrix-server). ### How do I set up my own Matrix server? diff --git a/docs/updating-users-passwords.md b/docs/updating-users-passwords.md index 49e05ce5f..953045b3a 100644 --- a/docs/updating-users-passwords.md +++ b/docs/updating-users-passwords.md @@ -39,7 +39,7 @@ This requires an [access token](obtaining-access-tokens.md) from a server admin If you didn't make your account a server admin when you created it, you can learn how to switch it now by reading about it in [Adding/Removing Administrator privileges to an existing Synapse user](registering-users.md#addingremoving-administrator-privileges-to-an-existing-synapse-user). ### Example: -To set @user:domain.com's password to `correct_horse_battery_staple` you could use this curl command: +To set @user:example.com's password to `correct_horse_battery_staple` you could use this curl command: ``` -curl -XPOST -d '{ "new_password": "correct_horse_battery_staple" }' "https://matrix./_matrix/client/r0/admin/reset_password/@user:domain.com?access_token=MDA...this_is_my_access_token +curl -XPOST -d '{ "new_password": "correct_horse_battery_staple" }' "https://matrix.example.com/_matrix/client/r0/admin/reset_password/@user:example.com?access_token=MDA...this_is_my_access_token ``` diff --git a/examples/reverse-proxies/nginx/README.md b/examples/reverse-proxies/nginx/README.md index fd7df72af..be52550e5 100644 --- a/examples/reverse-proxies/nginx/README.md +++ b/examples/reverse-proxies/nginx/README.md @@ -14,4 +14,4 @@ Copy the [matrix.conf](matrix.conf) file to your nginx server's filesystem, modi This configuration **disables SSL certificate retrieval**, so you will **need to obtain SSL certificates manually** (e.g. by using [certbot](https://certbot.eff.org/)) and set the appropriate path in `matrix.conf`. In the example nginx configuration, a single certificate is used for all subdomains (`matrix.DOMAIN`, `element.DOMAIN`, etc.). For your setup, may wish to change this and use separate `server` blocks and separate certificate files for each host. -Also note that your copy of the `matrix.conf` file has to be adapted to whatever services you are using. For example, remove `element.domain.com` from the `server_name` list if you don't use [Element](../../../docs/configuring-playbook-client-element.md) web client or add `dimension.domain.com` to it if you do use the [Dimension](../../../docs/configuring-playbook-dimension.md) integration manager. \ No newline at end of file +Also note that your copy of the `matrix.conf` file has to be adapted to whatever services you are using. For example, remove `element.example.com` from the `server_name` list if you don't use [Element](../../../docs/configuring-playbook-client-element.md) web client or add `dimension.example.com` to it if you do use the [Dimension](../../../docs/configuring-playbook-dimension.md) integration manager. diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index 09d73a602..8d1bc733c 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -73,7 +73,7 @@ matrix_bot_chatgpt_matrix_default_prefix_reply: false # MATRIX_DEFAULT_PREFIX_R # Matrix Access Control (optional) # # Lists of space-separated entries. Example: -# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :second-domain.com :third-domain.com" +# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :second-example.com :third-example.com" matrix_bot_chatgpt_matrix_blacklist: '' matrix_bot_chatgpt_matrix_whitelist: ':{{ matrix_domain }}' diff --git a/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 b/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 index 02c08b9e7..a0502c5f1 100644 --- a/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 +++ b/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 @@ -213,7 +213,7 @@ client_api: threshold: {{ matrix_dendrite_client_api_rate_limiting_threshold | to_json }} cooloff_ms: {{ matrix_dendrite_client_api_rate_limiting_cooloff_ms | to_json }} exempt_user_ids: - # - "@user:domain.com" + # - "@user:example.com" # Configuration for the Federation API. federation_api: diff --git a/roles/custom/matrix-dimension/defaults/main.yml b/roles/custom/matrix-dimension/defaults/main.yml index 11bd00d0d..1a19e9452 100644 --- a/roles/custom/matrix-dimension/defaults/main.yml +++ b/roles/custom/matrix-dimension/defaults/main.yml @@ -16,7 +16,7 @@ matrix_dimension_path_prefix: / # For information on how to acquire an access token, visit https://t2bot.io/docs/access_tokens matrix_dimension_access_token: "" -# Users in form: ['@user1:domain.com', '@user2:domain.com'] +# Users in form: ['@user1:example.com', '@user2:example.com'] matrix_dimension_admins: [] # Whether to allow Dimension widgets serve websites with invalid or self signed SSL certificates diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 index 9bb0bea75..3f7b8acd9 100644 --- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -691,7 +691,7 @@ tls_private_key_path: {{ matrix_synapse_tls_private_key_path|to_json }} # #federation_certificate_verification_whitelist: # - lon.example.com -# - "*.domain.com" +# - "*.example.com" # - "*.onion" # List of custom certificate authorities for federation traffic. From c02aba2724379f0a849afc7a888ba10caa237ed4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:25:30 +0900 Subject: [PATCH 04/37] Replace mydomain.com with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-traefik.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/configuring-playbook-traefik.md b/docs/configuring-playbook-traefik.md index 0a3c534eb..3b49a8bb9 100644 --- a/docs/configuring-playbook-traefik.md +++ b/docs/configuring-playbook-traefik.md @@ -57,9 +57,9 @@ However, if your service does not run on a container or runs on another machine, ## Reverse-proxying a remote HTTP/HTTPS service behind Traefik -If you want to host another webserver would be reachable via `my-fancy-website.mydomain.com` from the internet and via `https://:` from inside your network, you can make the playbook's integrated Traefik instance reverse-proxy the traffic to the correct host. +If you want to host another webserver would be reachable via `my-fancy-website.example.com` from the internet and via `https://:` from inside your network, you can make the playbook's integrated Traefik instance reverse-proxy the traffic to the correct host. -Prerequisites: DNS and routing for the domain `my-fancy-website.mydomain.com` need to be set up correctly. In this case, you'd be pointing the domain name to your Matrix server - `my-fancy-website.mydomain.com` would be a CNAME going to `matrix.example.com`. +Prerequisites: DNS and routing for the domain `my-fancy-website.example.com` need to be set up correctly. In this case, you'd be pointing the domain name to your Matrix server - `my-fancy-website.example.com` would be a CNAME going to `matrix.example.com`. First, we have to adjust the static configuration of Traefik, so that we can add additional configuration files: @@ -99,7 +99,7 @@ aux_file_definitions: http: routers: webserver-router: - rule: Host(`my_fancy_website.mydomain.com`) + rule: Host(`my_fancy_website.example.com`) service: webserver-service tls: certResolver: default @@ -122,7 +122,7 @@ aux_file_definitions: tcp: routers: webserver-router: - rule: Host(`my_fancy_website.mydomain.com`) + rule: Host(`my_fancy_website.example.com`) service: webserver-service tls: passthrough: true From 532babc55b51ebb3acd1b2459c38f3c05b0dd5a2 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:27:32 +0900 Subject: [PATCH 05/37] Replace yourdomain.com with example.com Signed-off-by: Suguru Hirahara --- roles/custom/matrix-media-repo/defaults/main.yml | 4 ++-- .../matrix-media-repo/templates/media-repo/media-repo.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/custom/matrix-media-repo/defaults/main.yml b/roles/custom/matrix-media-repo/defaults/main.yml index 45bc1b5cd..7f1ce62c4 100755 --- a/roles/custom/matrix-media-repo/defaults/main.yml +++ b/roles/custom/matrix-media-repo/defaults/main.yml @@ -366,9 +366,9 @@ matrix_media_repo_access_tokens_use_local_appservice_config: false # { # id: "Name_of_appservice_for_your_reference", # asToken: "Secret_token_for_appservices_to_use", -# senderUserId: "@_example_bridge:yourdomain.com", +# senderUserId: "@_example_bridge:example.com", # userNamespaces: [ -# regex: "@_example_bridge_.+:yourdomain.com" +# regex: "@_example_bridge_.+:example.com" # # A note about regexes: it is best to suffix *all* namespaces with the homeserver # # domain users are valid for, as otherwise the appservice can use any user with # # any domain name it feels like, even if that domain is not configured with the diff --git a/roles/custom/matrix-media-repo/templates/media-repo/media-repo.yaml.j2 b/roles/custom/matrix-media-repo/templates/media-repo/media-repo.yaml.j2 index f8597f265..30ab8cee5 100644 --- a/roles/custom/matrix-media-repo/templates/media-repo/media-repo.yaml.j2 +++ b/roles/custom/matrix-media-repo/templates/media-repo/media-repo.yaml.j2 @@ -153,9 +153,9 @@ accessTokens: # appservices: # - id: Name_of_appservice_for_your_reference # asToken: Secret_token_for_appservices_to_use -# senderUserId: "@_example_bridge:yourdomain.com" +# senderUserId: "@_example_bridge:example.com" # userNamespaces: -# - regex: "@_example_bridge_.+:yourdomain.com" +# - regex: "@_example_bridge_.+:example.com" # # A note about regexes: it is best to suffix *all* namespaces with the homeserver # # domain users are valid for, as otherwise the appservice can use any user with # # any domain name it feels like, even if that domain is not configured with the From e54d66053ccbdec30d7f3d96b19b24f97583d675 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:29:43 +0900 Subject: [PATCH 06/37] Replace with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bridge-appservice-webhooks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-bridge-appservice-webhooks.md b/docs/configuring-playbook-bridge-appservice-webhooks.md index 7d38ae871..d10f451b9 100644 --- a/docs/configuring-playbook-bridge-appservice-webhooks.md +++ b/docs/configuring-playbook-bridge-appservice-webhooks.md @@ -39,7 +39,7 @@ matrix_synapse_configuration_extension_yaml: | 6. Invite the bridge bot user to your room: - - either with `/invite @_webhook:` (**Note**: Make sure you have administration permissions in your room) + - either with `/invite @_webhook:example.com` (**Note**: Make sure you have administration permissions in your room) - or simply add the bridge bot to a private channel (personal channels imply you being an administrator) From ef8cf740a1a5cb7c364b194ab6b54b0fbfd1fa35 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:30:27 +0900 Subject: [PATCH 07/37] Replace mydomain.tld with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-ldap-auth.md | 4 ++-- roles/custom/matrix-synapse/defaults/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuring-playbook-ldap-auth.md b/docs/configuring-playbook-ldap-auth.md index 8a9898e05..cc07f396f 100644 --- a/docs/configuring-playbook-ldap-auth.md +++ b/docs/configuring-playbook-ldap-auth.md @@ -9,8 +9,8 @@ If you decide that you'd like to let this playbook install it for you, add the f ```yaml matrix_synapse_ext_password_provider_ldap_enabled: true matrix_synapse_ext_password_provider_ldap_uri: - - "ldap://ldap-01.mydomain.tld:389" - - "ldap://ldap-02.mydomain.tld:389" + - "ldap://ldap-01.example.com:389" + - "ldap://ldap-02.example.com:389" matrix_synapse_ext_password_provider_ldap_start_tls: true matrix_synapse_ext_password_provider_ldap_base: "ou=users,dc=example,dc=com" matrix_synapse_ext_password_provider_ldap_attributes_uid: "uid" diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 64872e0fd..c7489fa50 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -1153,7 +1153,7 @@ matrix_synapse_ext_password_provider_shared_secret_config_yaml: | # Enable this to activate LDAP password provider matrix_synapse_ext_password_provider_ldap_enabled: false -matrix_synapse_ext_password_provider_ldap_uri: "ldap://ldap.mydomain.tld:389" +matrix_synapse_ext_password_provider_ldap_uri: "ldap://ldap.example.com:389" matrix_synapse_ext_password_provider_ldap_start_tls: true matrix_synapse_ext_password_provider_ldap_mode: "search" matrix_synapse_ext_password_provider_ldap_base: "" From 288a711af6182fae90c29e606ceaadebeb274d70 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:31:12 +0900 Subject: [PATCH 08/37] Replace domain.tld with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-go-neb.md | 2 +- docs/configuring-well-known.md | 8 ++++---- roles/custom/matrix-bot-go-neb/defaults/main.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/configuring-playbook-bot-go-neb.md b/docs/configuring-playbook-bot-go-neb.md index 911a20839..5e01d83dd 100644 --- a/docs/configuring-playbook-bot-go-neb.md +++ b/docs/configuring-playbook-bot-go-neb.md @@ -207,7 +207,7 @@ matrix_bot_go_neb_services: webhook_url: "http://localhost/services/hooks/YWxlcnRtYW5hZ2VyX3NlcnZpY2U" # Each room will get the notification with the alert rendered with the given template rooms: - "!someroomid:domain.tld": + "!someroomid:example.com": text_template: "{% raw %}{{range .Alerts -}} [{{ .Status }}] {{index .Labels \"alertname\" }}: {{index .Annotations \"description\"}} {{ end -}}{% endraw %}" html_template: "{% raw %}{{range .Alerts -}} {{ $severity := index .Labels \"severity\" }} {{ if eq .Status \"firing\" }} {{ if eq $severity \"critical\"}} [FIRING - CRITICAL] {{ else if eq $severity \"warning\"}} [FIRING - WARNING] {{ else }} [FIRING - {{ $severity }}] {{ end }} {{ else }} [RESOLVED] {{ end }} {{ index .Labels \"alertname\"}} : {{ index .Annotations \"description\"}} source
{{end -}}{% endraw %}" msg_type: "m.text" # Must be either `m.text` or `m.notice` diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index 1237c96f3..fb5ec1b18 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -50,15 +50,15 @@ matrix_static_files_file_matrix_support_enabled: true # Homeserver admin contacts as per MSC 1929 https://github.com/matrix-org/matrix-spec-proposals/pull/1929 matrix_static_files_file_matrix_support_property_m_contacts: - matrix_id: "@admin1:{{ matrix_domain }}" - email_address: admin@domain.tld + email_address: admin@example.com role: m.role.admin - matrix_id: "@admin2:{{ matrix_domain }}" - email_address: admin2@domain.tld + email_address: admin2@example.com role: m.role.admin - - email_address: security@domain.tld + - email_address: security@example.com role: m.role.security -matrix_static_files_file_matrix_support_property_m_support_page: "https://example.domain.tld/support" +matrix_static_files_file_matrix_support_property_m_support_page: "https://example.example.com/support" ``` To learn how to set up `/.well-known/matrix/support` for the base domain, read the Installing section below. diff --git a/roles/custom/matrix-bot-go-neb/defaults/main.yml b/roles/custom/matrix-bot-go-neb/defaults/main.yml index 39622b398..866e756ad 100644 --- a/roles/custom/matrix-bot-go-neb/defaults/main.yml +++ b/roles/custom/matrix-bot-go-neb/defaults/main.yml @@ -321,7 +321,7 @@ matrix_bot_go_neb_services: [] # webhook_url: "http://localhost/services/hooks/YWxlcnRtYW5hZ2VyX3NlcnZpY2U" # # Each room will get the notification with the alert rendered with the given template # rooms: -# "!someroomid:domain.tld": +# "!someroomid:example.com": # text_template: "{% raw %}{{range .Alerts -}} [{{ .Status }}] {{index .Labels \"alertname\"}}: {{index .Annotations \"description\"}} {{ end -}}{% endraw %}" # html_template: "{% raw %}{{range .Alerts -}} {{ $severity := index .Labels \"severity\"}} {{ if eq .Status \"firing\"}} {{ if eq $severity \"critical\"}} [FIRING - CRITICAL] {{ else if eq $severity \"warning\"}} [FIRING - WARNING] {{ else }} [FIRING - {{ $severity }}] {{ end }} {{ else }} [RESOLVED] {{ end }} {{ index .Labels \"alertname\"}} : {{ index .Annotations \"description\"}} source
{{end -}}{% endraw %}" # msg_type: "m.text" # Must be either `m.text` or `m.notice` From d218e9315563678db788d679b79e796c9eb560fc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:32:32 +0900 Subject: [PATCH 09/37] Replace example.tld with example.com Signed-off-by: Suguru Hirahara --- examples/reverse-proxies/caddy2-in-container/Caddyfile | 8 ++++---- examples/reverse-proxies/caddy2-in-container/README.md | 2 +- examples/reverse-proxies/caddy2/Caddyfile | 8 ++++---- examples/reverse-proxies/caddy2/README.md | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/reverse-proxies/caddy2-in-container/Caddyfile b/examples/reverse-proxies/caddy2-in-container/Caddyfile index 9f1128c2f..10df00d46 100644 --- a/examples/reverse-proxies/caddy2-in-container/Caddyfile +++ b/examples/reverse-proxies/caddy2-in-container/Caddyfile @@ -1,4 +1,4 @@ -matrix.example.tld { +matrix.example.com { handle { encode zstd gzip @@ -14,7 +14,7 @@ matrix.example.tld { } # Put `https://` at the beginning to enforce https protocol as 8448 is not the default https port (which is 443) -https://matrix.example.tld:8448 { +https://matrix.example.com:8448 { handle { encode zstd gzip @@ -29,14 +29,14 @@ https://matrix.example.tld:8448 { } -example.tld { +example.com { # Uncomment this if you are following "(Option 3): Setting up reverse-proxying of the well-known files from the base domain's server to the Matrix server" of https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-well-known.md#option-3-setting-up-reverse-proxying-of-the-well-known-files-from-the-base-domains-server-to-the-matrix-server @wellknown { path /.well-known/matrix/* } handle @wellknown { - reverse_proxy https://matrix.example.tld { + reverse_proxy https://matrix.example.com { header_up Host {http.reverse_proxy.upstream.hostport} } } diff --git a/examples/reverse-proxies/caddy2-in-container/README.md b/examples/reverse-proxies/caddy2-in-container/README.md index 7a294f7ce..925547f4e 100644 --- a/examples/reverse-proxies/caddy2-in-container/README.md +++ b/examples/reverse-proxies/caddy2-in-container/README.md @@ -14,6 +14,6 @@ Then, adjust your Caddy `docker-compose.yaml` file (if you're using docker-comp ## Using the Caddyfile You can either just use the [Caddyfile](Caddyfile) directly or append its content to your own Caddyfile. -In both cases make sure to replace all the `example.tld` domains with your own domain. +In both cases make sure to replace all the `example.com` domains with your own domain. This example does not include additional services like Element, but you should be able copy the first block and replace the `matrix.` subdomain with the subdomain of the some other service (e.g. `element.`). diff --git a/examples/reverse-proxies/caddy2/Caddyfile b/examples/reverse-proxies/caddy2/Caddyfile index 2ffcea520..c63b794ca 100644 --- a/examples/reverse-proxies/caddy2/Caddyfile +++ b/examples/reverse-proxies/caddy2/Caddyfile @@ -1,4 +1,4 @@ -matrix.example.tld { +matrix.example.com { handle { encode zstd gzip @@ -12,7 +12,7 @@ matrix.example.tld { } } -matrix.example.tld:8448 { +matrix.example.com:8448 { handle { encode zstd gzip @@ -26,14 +26,14 @@ matrix.example.tld:8448 { } -example.tld { +example.com { # Uncomment this if you are following "(Option 3): Setting up reverse-proxying of the well-known files from the base domain's server to the Matrix server" of https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-well-known.md#option-3-setting-up-reverse-proxying-of-the-well-known-files-from-the-base-domains-server-to-the-matrix-server @wellknown { path /.well-known/matrix/* } handle @wellknown { - reverse_proxy https://matrix.example.tld { + reverse_proxy https://matrix.example.com { header_up Host {http.reverse_proxy.upstream.hostport} } } diff --git a/examples/reverse-proxies/caddy2/README.md b/examples/reverse-proxies/caddy2/README.md index 8ec8fb3eb..0c73fce5d 100644 --- a/examples/reverse-proxies/caddy2/README.md +++ b/examples/reverse-proxies/caddy2/README.md @@ -11,6 +11,6 @@ To get started, first follow the [front the integrated reverse-proxy webserver w ## Using the Caddyfile You can either just use the [Caddyfile](Caddyfile) directly or append its content to your own Caddyfile. -In both cases make sure to replace all the `example.tld` domains with your own domain. +In both cases make sure to replace all the `example.com` domains with your own domain. This example does not include additional services like element, but you should be able copy the first block and replace the matrix subdomain with the additional services subdomain. I have not tested this though. From b2d840482a9ae38582284c1cf6489653fb2b45ea Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:34:57 +0900 Subject: [PATCH 10/37] Replace domain names on roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2 Signed-off-by: Suguru Hirahara --- .../templates/config.yaml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2 b/roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2 index 8502ae753..f6075388f 100644 --- a/roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2 +++ b/roles/custom/matrix-bot-matrix-reminder-bot/templates/config.yaml.j2 @@ -39,9 +39,9 @@ allowlist: enabled: {{ matrix_bot_matrix_reminder_bot_allowlist_enabled | to_json }} # A list of MXID regexes to be allowed # To allow a certain homeserver: - # regexes: ["@[a-z0-9-_.]+:myhomeserver.tld"] + # regexes: ["@[a-z0-9-_.]+:example.com"] # To allow a set of users: - # regexes: ["@alice:someserver.tld", "@bob:anotherserver.tld"] + # regexes: ["@alice:example.net", "@bob:example.org"] # To allow nobody (same as blocking every MXID): # regexes: [] regexes: {{ matrix_bot_matrix_reminder_bot_allowlist_regexes | to_json }} @@ -53,9 +53,9 @@ blocklist: enabled: {{ matrix_bot_matrix_reminder_bot_blocklist_enabled | to_json }} # A list of MXID regexes to be blocked # To block a certain homeserver: - # regexes: [".*:myhomeserver.tld"] + # regexes: [".*:example.com"] # To block a set of users: - # regexes: ["@alice:someserver.tld", "@bob:anotherserver.tld"] + # regexes: ["@alice:example.net", "@bob:example.org"] # To block absolutely everyone (same as allowing nobody): # regexes: [".*"] regexes: {{ matrix_bot_matrix_reminder_bot_blocklist_regexes | to_json }} From fe238474a5acdbeb18cbad85d84376823c3bf521 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:36:41 +0900 Subject: [PATCH 11/37] Replace matrix-homeserver-domain with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-appservice-draupnir-for-all.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuring-playbook-appservice-draupnir-for-all.md b/docs/configuring-playbook-appservice-draupnir-for-all.md index b3ffe05f3..6205fd872 100644 --- a/docs/configuring-playbook-appservice-draupnir-for-all.md +++ b/docs/configuring-playbook-appservice-draupnir-for-all.md @@ -59,7 +59,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ## Usage -If you made it through all the steps above and your main control room was joined by a user called `@draupnir-main:matrix-homeserver-domain` you have succesfully installed Draupnir for All and can now start using it. +If you made it through all the steps above and your main control room was joined by a user called `@draupnir-main:example.com` you have succesfully installed Draupnir for All and can now start using it. The installation of Draupnir for all in this playbook is very much Alpha quality. Usage-wise, Draupnir for allis almost identical to Draupnir bot mode. @@ -69,11 +69,11 @@ Draupnir for all includes several security measures like that it only allows use The bot requires a powerlevel of 50 in the management room to control who is allowed to use the bot. The bot does currently not say anything if this is true or false. (This is considered a bug and is documented in issue [#297](https://github.com/the-draupnir-project/Draupnir/issues/297)) -To allow users or whole homeservers you type /plain @draupnir-main:matrix-homeserver-domain allow `target` and target can be either a MXID or a wildcard like `@*:example.com` to allow all users on example.com to register. We use /plain to force the client to not attempt to mess with this command as it can break Wildcard commands especially. +To allow users or whole homeservers you type /plain @draupnir-main:example.com allow `target` and target can be either a MXID or a wildcard like `@*:example.com` to allow all users on example.com to register. We use /plain to force the client to not attempt to mess with this command as it can break Wildcard commands especially. ### 2. How to provision a D4A once you are allowed to. -Open a DM with @draupnir-main:matrix-homeserver-domain and if using Element send a message into this DM to finalise creating it. The bot will reject this invite and you will shortly get invited to the Draupnir control room for your newly provisioned Draupnir. From here its just a normal Draupnir experience. +Open a DM with @draupnir-main:example.com and if using Element send a message into this DM to finalise creating it. The bot will reject this invite and you will shortly get invited to the Draupnir control room for your newly provisioned Draupnir. From here its just a normal Draupnir experience. Congratulations if you made it all the way here because you now have a fully working Draupnir for all deployment. From 02e0c2c3e051c78884898f0060c45ace9e81e3c4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 10 Oct 2024 03:45:16 +0900 Subject: [PATCH 12/37] =?UTF-8?q?Edit=20user=20identifier=20example:=20DOM?= =?UTF-8?q?AIN=20=E2=86=92=20{{=20matrix=5Fdomain=20}}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-buscarron.md | 2 +- docs/configuring-playbook-bot-honoroit.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-bot-buscarron.md b/docs/configuring-playbook-bot-buscarron.md index fc9c28675..e04ce58e2 100644 --- a/docs/configuring-playbook-bot-buscarron.md +++ b/docs/configuring-playbook-bot-buscarron.md @@ -44,7 +44,7 @@ matrix_bot_buscarron_password: PASSWORD_FOR_THE_BOT # Adjust accepted forms matrix_bot_buscarron_forms: - name: contact # (mandatory) Your form name, will be used as endpoint, eg: buscarron.DOMAIN/contact - room: "!yourRoomID:DOMAIN" # (mandatory) Room ID where form submission will be posted + room: "!yourRoomID:{{ matrix_domain }}" # (mandatory) Room ID where form submission will be posted redirect: https://DOMAIN # (mandatory) To what page user will be redirected after the form submission ratelimit: 1r/m # (optional) rate limit of the form, format: r/, eg: 1r/s or 54r/m hasemail: 1 # (optional) form has "email" field that should be validated diff --git a/docs/configuring-playbook-bot-honoroit.md b/docs/configuring-playbook-bot-honoroit.md index 459f7be4d..9f88ee8dd 100644 --- a/docs/configuring-playbook-bot-honoroit.md +++ b/docs/configuring-playbook-bot-honoroit.md @@ -25,7 +25,7 @@ matrix_bot_honoroit_enabled: true matrix_bot_honoroit_password: PASSWORD_FOR_THE_BOT # Adjust this to your room ID -matrix_bot_honoroit_roomid: "!yourRoomID:DOMAIN" +matrix_bot_honoroit_roomid: "!yourRoomID:{{ matrix_domain }}" ``` From 95ab7fabd02ba43bd11644ad27dade90b1530260 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 10 Oct 2024 22:17:04 +0900 Subject: [PATCH 13/37] =?UTF-8?q?Edit=20user=20identifier=20example:=20exa?= =?UTF-8?q?mple.com=20=E2=86=92=20{{=20matrix=5Fdomain=20}}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-baibot.md | 2 +- docs/configuring-playbook-bot-postmoogle.md | 4 ++-- roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/configuring-playbook-bot-baibot.md b/docs/configuring-playbook-bot-baibot.md index e13c9c81e..86785d3c3 100644 --- a/docs/configuring-playbook-bot-baibot.md +++ b/docs/configuring-playbook-bot-baibot.md @@ -93,7 +93,7 @@ If `matrix_admin` is already configured in your `vars.yml` configuration, you ca # # .. unless you've made yourself an admin of all bots/bridges like this: # -# matrix_admin: '@yourAdminAccount:example.com' +# matrix_admin: '@yourAdminAccount:{{ matrix_domain }}' ``` ### 👥 Initial users configuration diff --git a/docs/configuring-playbook-bot-postmoogle.md b/docs/configuring-playbook-bot-postmoogle.md index 8674a8641..35f141a4d 100644 --- a/docs/configuring-playbook-bot-postmoogle.md +++ b/docs/configuring-playbook-bot-postmoogle.md @@ -39,11 +39,11 @@ matrix_bot_postmoogle_password: PASSWORD_FOR_THE_BOT # Uncomment to add one or more admins to this bridge: # # matrix_bot_postmoogle_admins: -# - '@yourAdminAccount:example.com' +# - '@yourAdminAccount:{{ matrix_domain }}' # # .. unless you've made yourself an admin of all bots/bridges like this: # -# matrix_admin: '@yourAdminAccount:example.com' +# matrix_admin: '@yourAdminAccount:{{ matrix_domain }}' ``` ### DNS diff --git a/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 b/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 index a0502c5f1..4f1c02f21 100644 --- a/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 +++ b/roles/custom/matrix-dendrite/templates/dendrite.yaml.j2 @@ -213,7 +213,7 @@ client_api: threshold: {{ matrix_dendrite_client_api_rate_limiting_threshold | to_json }} cooloff_ms: {{ matrix_dendrite_client_api_rate_limiting_cooloff_ms | to_json }} exempt_user_ids: - # - "@user:example.com" + # - "@user:{{ matrix_domain }}" # Configuration for the Federation API. federation_api: From 90cfdabb2b227e2c613c3eb9d337cb04aa22bd17 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:17:56 +0900 Subject: [PATCH 14/37] Replace DOMAIN with example.com Signed-off-by: Suguru Hirahara --- CHANGELOG.md | 38 +++++++------- docs/configuring-captcha.md | 2 +- ...figuring-playbook-alertmanager-receiver.md | 8 +-- ...uring-playbook-appservice-double-puppet.md | 2 +- ...ng-playbook-appservice-draupnir-for-all.md | 4 +- docs/configuring-playbook-backup-borg.md | 2 +- ...onfiguring-playbook-base-domain-serving.md | 12 ++--- docs/configuring-playbook-bot-baibot.md | 8 +-- docs/configuring-playbook-bot-buscarron.md | 14 +++--- docs/configuring-playbook-bot-chatgpt.md | 4 +- docs/configuring-playbook-bot-draupnir.md | 16 +++--- docs/configuring-playbook-bot-go-neb.md | 6 +-- docs/configuring-playbook-bot-honoroit.md | 4 +- ...ng-playbook-bot-matrix-registration-bot.md | 6 +-- ...guring-playbook-bot-matrix-reminder-bot.md | 6 +-- docs/configuring-playbook-bot-maubot.md | 2 +- docs/configuring-playbook-bot-mjolnir.md | 12 ++--- docs/configuring-playbook-bot-postmoogle.md | 4 +- ...figuring-playbook-bridge-appservice-irc.md | 2 +- ...ng-playbook-bridge-appservice-kakaotalk.md | 2 +- ...guring-playbook-bridge-appservice-slack.md | 8 +-- ...iguring-playbook-bridge-beeper-linkedin.md | 2 +- ...iguring-playbook-bridge-go-skype-bridge.md | 2 +- ...onfiguring-playbook-bridge-heisenbridge.md | 4 +- docs/configuring-playbook-bridge-hookshot.md | 4 +- ...uring-playbook-bridge-matrix-bridge-sms.md | 2 +- ...iguring-playbook-bridge-mautrix-discord.md | 2 +- ...guring-playbook-bridge-mautrix-facebook.md | 4 +- ...uring-playbook-bridge-mautrix-gmessages.md | 2 +- ...ring-playbook-bridge-mautrix-googlechat.md | 2 +- ...guring-playbook-bridge-mautrix-hangouts.md | 2 +- ...uring-playbook-bridge-mautrix-instagram.md | 2 +- ...-playbook-bridge-mautrix-meta-instagram.md | 2 +- ...-playbook-bridge-mautrix-meta-messenger.md | 2 +- ...figuring-playbook-bridge-mautrix-signal.md | 2 +- ...nfiguring-playbook-bridge-mautrix-slack.md | 2 +- ...guring-playbook-bridge-mautrix-telegram.md | 6 +-- ...iguring-playbook-bridge-mautrix-twitter.md | 2 +- ...guring-playbook-bridge-mautrix-whatsapp.md | 2 +- ...iguring-playbook-bridge-mautrix-wsproxy.md | 4 +- ...uring-playbook-bridge-mx-puppet-discord.md | 2 +- ...uring-playbook-bridge-mx-puppet-groupme.md | 2 +- ...ing-playbook-bridge-mx-puppet-instagram.md | 2 +- ...iguring-playbook-bridge-mx-puppet-slack.md | 4 +- ...iguring-playbook-bridge-mx-puppet-steam.md | 2 +- ...uring-playbook-bridge-mx-puppet-twitter.md | 2 +- docs/configuring-playbook-bridge-wechat.md | 2 +- docs/configuring-playbook-cactus-comments.md | 2 +- docs/configuring-playbook-client-cinny.md | 8 +-- docs/configuring-playbook-client-hydrogen.md | 8 +-- ...configuring-playbook-client-schildichat.md | 8 +-- docs/configuring-playbook-dimension.md | 2 +- docs/configuring-playbook-dynamic-dns.md | 2 +- docs/configuring-playbook-email.md | 2 +- docs/configuring-playbook-email2matrix.md | 6 +-- docs/configuring-playbook-etherpad.md | 10 ++-- .../configuring-playbook-external-postgres.md | 2 +- docs/configuring-playbook-federation.md | 2 +- docs/configuring-playbook-jitsi.md | 20 ++++---- docs/configuring-playbook-ldap-auth.md | 2 +- docs/configuring-playbook-ma1sd.md | 6 +-- docs/configuring-playbook-matrix-corporal.md | 2 +- ...playbook-matrix-ldap-registration-proxy.md | 2 +- .../configuring-playbook-matrix-media-repo.md | 4 +- ...onfiguring-playbook-matrix-registration.md | 6 +-- docs/configuring-playbook-mautrix-bridges.md | 8 +-- docs/configuring-playbook-ntfy.md | 4 +- docs/configuring-playbook-own-webserver.md | 4 +- docs/configuring-playbook-pantalaimon.md | 2 +- docs/configuring-playbook-postgres-backup.md | 2 +- ...configuring-playbook-prometheus-grafana.md | 22 ++++---- ...onfiguring-playbook-prometheus-nginxlog.md | 4 +- ...onfiguring-playbook-prometheus-postgres.md | 4 +- docs/configuring-playbook-rageshake.md | 6 +-- docs/configuring-playbook-rest-auth.md | 2 +- docs/configuring-playbook-riot-web.md | 8 +-- docs/configuring-playbook-s3-goofys.md | 2 +- docs/configuring-playbook-s3.md | 4 +- ...configuring-playbook-shared-secret-auth.md | 2 +- ...configuring-playbook-sliding-sync-proxy.md | 6 +-- docs/configuring-playbook-ssl-certificates.md | 4 +- docs/configuring-playbook-sygnal.md | 8 +-- docs/configuring-playbook-synapse-admin.md | 4 +- ...ing-playbook-synapse-auto-accept-invite.md | 2 +- ...guring-playbook-synapse-auto-compressor.md | 2 +- ...guring-playbook-synapse-simple-antispam.md | 2 +- ...iguring-playbook-synapse-usage-exporter.md | 4 +- docs/configuring-playbook-synapse.md | 4 +- docs/configuring-playbook-telemetry.md | 2 +- docs/configuring-playbook-traefik.md | 2 +- docs/configuring-playbook-turn.md | 2 +- ...ring-playbook-user-verification-service.md | 2 +- docs/faq.md | 50 +++++++++---------- docs/maintenance-and-troubleshooting.md | 2 +- docs/maintenance-migrating.md | 2 +- docs/maintenance-synapse.md | 2 +- docs/obtaining-access-tokens.md | 8 +-- docs/registering-users.md | 4 +- examples/reverse-proxies/apache/README.md | 4 +- .../apache/matrix-client-element.conf | 16 +++--- .../reverse-proxies/apache/matrix-domain.conf | 26 +++++----- .../nginx-proxy-manager/README.md | 10 ++-- examples/reverse-proxies/nginx/README.md | 2 +- group_vars/matrix_servers | 2 +- .../defaults/main.yml | 2 +- roles/custom/matrix-base/defaults/main.yml | 2 +- .../matrix-base/tasks/validate_config.yml | 2 +- .../matrix-bot-chatgpt/defaults/main.yml | 2 +- .../matrix-bot-chatgpt/templates/env.j2 | 2 +- .../tasks/validate_config.yml | 2 +- .../defaults/main.yml | 6 +-- .../defaults/main.yml | 6 +-- .../matrix-media-repo/defaults/main.yml | 2 +- .../matrix-registration/defaults/main.yml | 2 +- .../matrix-sliding-sync/defaults/main.yml | 2 +- .../matrix-static-files/defaults/main.yml | 4 +- .../defaults/main.yml | 2 +- roles/custom/matrix-synapse/defaults/main.yml | 4 +- 118 files changed, 304 insertions(+), 304 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54535161d..8085178f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -195,7 +195,7 @@ matrix_synapse_admin_config_restrictBaseUrl: [] ## The URL-prefix for Hookshot generic webhooks has changed -Until now, generic Hookshot webhook URLs looked like this: `https://matrix.DOMAIN/hookshot/webhooks/:hookId`. +Until now, generic Hookshot webhook URLs looked like this: `https://matrix.example.com/hookshot/webhooks/:hookId`. The `/hookshot/webhooks` common prefix gets stripped by Traefik automatically, so Hookshot only sees the part that comes after (`/:hookId`). @@ -331,7 +331,7 @@ Refer to our new [Tuning caches and cache autotuning](docs/maintenance-synapse.m This only affects people who are [Serving a static website at the base domain](./docs/configuring-playbook-base-domain-serving.md#serving-a-static-website-at-the-base-domain), but not managing its `index.html` through the playbook. -That is, for people who have `matrix_static_files_file_index_html_enabled: false` in their `vars.yml` configuration, the playbook has a new default behavior. Since the playbook is not managing the `index.html` file, it will default to a more sensible way of handling the base domain - redirecting `https://DOMAIN/` to `https://matrix.DOMAIN/`, instead of serving a 404 page. +That is, for people who have `matrix_static_files_file_index_html_enabled: false` in their `vars.yml` configuration, the playbook has a new default behavior. Since the playbook is not managing the `index.html` file, it will default to a more sensible way of handling the base domain - redirecting `https://example.com/` to `https://matrix.example.com/`, instead of serving a 404 page. If you are managing your static website by yourself (by dropping files into `/matrix/static-files/public` somehow), then you probably don't wish for such redirection to happen. You can disable it by adding `matrix_static_files_container_labels_base_domain_root_path_redirection_enabled: false` to your `vars.yml` configuration file. @@ -448,7 +448,7 @@ To perform this new role, Traefik now has a new internal [entrypoint](https://do Doing so, services can contact Traefik on this entrypoint's dedicated port (the URL defaults to `http://matrix-traefik:8008`) and reach the homeserver Client-Server API as they expect. Internally, Traefik takes care of the routing to the correct service. -We've also considered keeping it simple and having services talk to the homeserver over the public internet (e.g. `https://matrix.DOMAIN`) thus reusing all existing Traefik routing labels. In this scenario, performance was incredibly poor (e.g. 70 rps, instead of 1400 rps) due to TLS and networking overhead. The need for fast internal communication (via the new internal non-TLS-enabled Traefik entrypoint) is definitely there. In our benchmarks, Traefik even proved more efficient than nginx at doing this: ~1200 rps for Traefik compared to ~900 rps for nginx (out of ~1400 rps when talking to the Synapse homeserver directly). +We've also considered keeping it simple and having services talk to the homeserver over the public internet (e.g. `https://matrix.example.com`) thus reusing all existing Traefik routing labels. In this scenario, performance was incredibly poor (e.g. 70 rps, instead of 1400 rps) due to TLS and networking overhead. The need for fast internal communication (via the new internal non-TLS-enabled Traefik entrypoint) is definitely there. In our benchmarks, Traefik even proved more efficient than nginx at doing this: ~1200 rps for Traefik compared to ~900 rps for nginx (out of ~1400 rps when talking to the Synapse homeserver directly). Traefik serving this second purpose has a few downsides: @@ -1378,15 +1378,15 @@ Various services (like Dimension, etc.) still talk to Synapse via `matrix-nginx- ## (Backward Compatibility Break) A new default standalone mode for Etherpad -Until now, [Etherpad](https://etherpad.org/) (which [the playbook could install for you](docs/configuring-playbook-etherpad.md)) required the [Dimension integration manager](docs/configuring-playbook-dimension.md) to also be installed, because Etherpad was hosted on the Dimension domain (at `dimension.DOMAIN/etherpad`). +Until now, [Etherpad](https://etherpad.org/) (which [the playbook could install for you](docs/configuring-playbook-etherpad.md)) required the [Dimension integration manager](docs/configuring-playbook-dimension.md) to also be installed, because Etherpad was hosted on the Dimension domain (at `dimension.example.com/etherpad`). -From now on, Etherpad can be installed in `standalone` mode on `etherpad.DOMAIN` and used even without Dimension. This is much more versatile, so the playbook now defaults to this new mode (`etherpad_mode: standalone`). +From now on, Etherpad can be installed in `standalone` mode on `etherpad.example.com` and used even without Dimension. This is much more versatile, so the playbook now defaults to this new mode (`etherpad_mode: standalone`). If you've already got both Etherpad and Dimension in use you could: - **either** keep hosting Etherpad under the Dimension domain by adding `etherpad_mode: dimension` to your `vars.yml` file. All your existing room widgets will continue working at the same URLs and no other changes will be necessary. -- **or**, you could change to hosting Etherpad separately on `etherpad.DOMAIN`. You will need to [configure a DNS record](docs/configuring-dns.md) for this new domain. You will also need to reconfigure Dimension to use the new pad URLs (`https://etherpad.DOMAIN/...`) going forward (refer to our [configuring Etherpad documentation](docs/configuring-playbook-etherpad.md)). All your existing room widgets (which still use `https://dimension.DOMAIN/etherpad/...`) will break as Etherpad is not hosted there anymore. You will need to re-add them or to consider not using `standalone` mode +- **or**, you could change to hosting Etherpad separately on `etherpad.example.com`. You will need to [configure a DNS record](docs/configuring-dns.md) for this new domain. You will also need to reconfigure Dimension to use the new pad URLs (`https://etherpad.example.com/...`) going forward (refer to our [configuring Etherpad documentation](docs/configuring-playbook-etherpad.md)). All your existing room widgets (which still use `https://dimension.example.com/etherpad/...`) will break as Etherpad is not hosted there anymore. You will need to re-add them or to consider not using `standalone` mode # 2022-11-04 @@ -1665,26 +1665,26 @@ See our [Setting up the ntfy push notifications server](docs/configuring-playboo **TLDR**: we've made extensive **changes to metrics exposure/collection, which concern people using an external Prometheus server**. If you don't know what that is, you don't need to read below. -**Why do major changes to metrics**? Because various services were exposing metrics in different, hacky, ways. Synapse was exposing metrics at `/_synapse/metrics` and `/_synapse-worker-.../metrics` on the `matrix.DOMAIN`. The Hookshot role was **repurposing** the Granana web UI domain (`stats.DOMAIN`) for exposing its metrics on `stats.DOMAIN/hookshot/metrics`, while protecting these routes using Basic Authentication **normally used for Synapse** (`/_synapse/metrics`). Node-exporter and Postgres-exporter roles were advising for more `stats.DOMAIN` usage in manual ways. Each role was doing things differently and mixing variables from other roles. Each metrics endpoint was ending up in a different place, protected by who knows what Basic Authentication credentials (if protected at all). +**Why do major changes to metrics**? Because various services were exposing metrics in different, hacky, ways. Synapse was exposing metrics at `/_synapse/metrics` and `/_synapse-worker-.../metrics` on the `matrix.example.com`. The Hookshot role was **repurposing** the Granana web UI domain (`stats.example.com`) for exposing its metrics on `stats.example.com/hookshot/metrics`, while protecting these routes using Basic Authentication **normally used for Synapse** (`/_synapse/metrics`). Node-exporter and Postgres-exporter roles were advising for more `stats.example.com` usage in manual ways. Each role was doing things differently and mixing variables from other roles. Each metrics endpoint was ending up in a different place, protected by who knows what Basic Authentication credentials (if protected at all). -**The solution**: a completely revamped way to expose metrics to an external Prometheus server. We are **introducing new `https://matrix.DOMAIN/metrics/*` endpoints**, where various services *can* expose their metrics, for collection by external Prometheus servers. To enable the `/metrics/*` endpoints, use `matrix_nginx_proxy_proxy_matrix_metrics_enabled: true`. There's also a way to protect access using [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). See the `matrix-nginx-proxy` role or our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation for additional variables around `matrix_nginx_proxy_proxy_matrix_metrics_enabled`. +**The solution**: a completely revamped way to expose metrics to an external Prometheus server. We are **introducing new `https://matrix.example.com/metrics/*` endpoints**, where various services *can* expose their metrics, for collection by external Prometheus servers. To enable the `/metrics/*` endpoints, use `matrix_nginx_proxy_proxy_matrix_metrics_enabled: true`. There's also a way to protect access using [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). See the `matrix-nginx-proxy` role or our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation for additional variables around `matrix_nginx_proxy_proxy_matrix_metrics_enabled`. **If you are using the [Hookshot bridge](docs/configuring-playbook-bridge-hookshot.md)**, you may find that: 1. **Metrics may not be enabled by default anymore**: - If Prometheus is enabled (`prometheus_enabled: true`), then Hookshot metrics will be enabled automatically (`matrix_hookshot_metrics_enabled: true`). These metrics will be collected from the local (in-container) Prometheus over the container network. - **If Prometheus is not enabled** (you are either not using Prometheus or are using an external one), **Hookshot metrics will not be enabled by default anymore**. Feel free to enable them by setting `matrix_hookshot_metrics_enabled: true`. Also, see below. -2. When metrics are meant to be **consumed by an external Prometheus server**, `matrix_hookshot_metrics_proxying_enabled` needs to be set to `true`, so that metrics would be exposed (proxied) "publicly" on `https://matrix.DOMAIN/metrics/hookshot`. To make use of this, you'll also need to enable the new `https://matrix.DOMAIN/metrics/*` endpoints mentioned above, using `matrix_nginx_proxy_proxy_matrix_metrics_enabled`. Learn more in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. -3. **We've changed the URL we're exposing Hookshot metrics at** for external Prometheus servers. Until now, you were advised to consume Hookshot metrics from `https://stats.DOMAIN/hookshot/metrics` (working in conjunction with `matrix_nginx_proxy_proxy_synapse_metrics`). From now on, **this no longer works**. As described above, you need to start consuming metrics from `https://matrix.DOMAIN/metrics/hookshot`. +2. When metrics are meant to be **consumed by an external Prometheus server**, `matrix_hookshot_metrics_proxying_enabled` needs to be set to `true`, so that metrics would be exposed (proxied) "publicly" on `https://matrix.example.com/metrics/hookshot`. To make use of this, you'll also need to enable the new `https://matrix.example.com/metrics/*` endpoints mentioned above, using `matrix_nginx_proxy_proxy_matrix_metrics_enabled`. Learn more in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. +3. **We've changed the URL we're exposing Hookshot metrics at** for external Prometheus servers. Until now, you were advised to consume Hookshot metrics from `https://stats.example.com/hookshot/metrics` (working in conjunction with `matrix_nginx_proxy_proxy_synapse_metrics`). From now on, **this no longer works**. As described above, you need to start consuming metrics from `https://matrix.example.com/metrics/hookshot`. -**If you're using node-exporter** (`matrix_prometheus_node_exporter_enabled: true`) and would like to collect its metrics from an external Prometheus server, see `matrix_prometheus_node_exporter_metrics_proxying_enabled` described in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. You will be able to collect its metrics from `https://matrix.DOMAIN/metrics/node-exporter`. +**If you're using node-exporter** (`matrix_prometheus_node_exporter_enabled: true`) and would like to collect its metrics from an external Prometheus server, see `matrix_prometheus_node_exporter_metrics_proxying_enabled` described in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. You will be able to collect its metrics from `https://matrix.example.com/metrics/node-exporter`. -**If you're using [postgres-exporter](docs/configuring-playbook-prometheus-postgres.md)** (`prometheus_postgres_exporter_enabled: true`) and would like to collect its metrics from an external Prometheus server, see `matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_metrics_proxying_enabled` described in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. You will be able to collect its metrics from `https://matrix.DOMAIN/metrics/postgres-exporter`. +**If you're using [postgres-exporter](docs/configuring-playbook-prometheus-postgres.md)** (`prometheus_postgres_exporter_enabled: true`) and would like to collect its metrics from an external Prometheus server, see `matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_metrics_proxying_enabled` described in our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation. You will be able to collect its metrics from `https://matrix.example.com/metrics/postgres-exporter`. **If you're using Synapse** and would like to collect its metrics from an external Prometheus server, you may find that: 1. Exposing metrics is now done using `matrix_synapse_metrics_proxying_enabled`, not `matrix_nginx_proxy_proxy_synapse_metrics: true`. You may still need to enable metrics using `matrix_synapse_metrics_enabled: true` before exposing them. 2. Protecting metrics endpoints using [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication) is now done in another way. See our [Collecting metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server) documentation -3. If Synapse metrics are exposed, they will be made available at `https://matrix.DOMAIN/metrics/synapse/main-process` or `https://matrix.DOMAIN/metrics/synapse/worker/TYPE-ID` (when workers are enabled), not at `https://matrix.DOMAIN/_synapse/metrics` and `https://matrix.DOMAIN/_synapse-worker-.../metrics` +3. If Synapse metrics are exposed, they will be made available at `https://matrix.example.com/metrics/synapse/main-process` or `https://matrix.example.com/metrics/synapse/worker/TYPE-ID` (when workers are enabled), not at `https://matrix.example.com/_synapse/metrics` and `https://matrix.example.com/_synapse-worker-.../metrics` 4. The playbook still generates an `external_prometheus.yml.example` sample file for scraping Synapse from Prometheus as described in [Collecting Synapse worker metrics to an external Prometheus server](docs/configuring-playbook-prometheus-grafana.md#collecting-synapse-worker-metrics-to-an-external-prometheus-server), but it's now saved under `/matrix/synapse` (not `/matrix`). **If you where already using a external Prometheus server** before this change, and you gave a hashed version of the password as a variable, the playbook will now take care of hashing the password for you. Thus, you need to provide the non-hashed version now. @@ -2074,7 +2074,7 @@ Thanks to [@Peetz0r](https://github.com/Peetz0r), the playbook can now install a To get get these installed, follow our [Enabling metrics and graphs (Prometheus, Grafana) for your Matrix server](docs/configuring-playbook-prometheus-grafana.md) docs page. -This update comes with a **potential breaking change** for people who were already exposing Synapse metrics (for consumption via another Prometheus installation). From now on, `matrix_synapse_metrics_enabled: true` no longer exposes metrics publicly via matrix-nginx-proxy (at `https://matrix.DOMAIN/_synapse/metrics`). To do so, you'd need to explicitly set `matrix_nginx_proxy_proxy_synapse_metrics: true`. +This update comes with a **potential breaking change** for people who were already exposing Synapse metrics (for consumption via another Prometheus installation). From now on, `matrix_synapse_metrics_enabled: true` no longer exposes metrics publicly via matrix-nginx-proxy (at `https://matrix.example.com/_synapse/metrics`). To do so, you'd need to explicitly set `matrix_nginx_proxy_proxy_synapse_metrics: true`. # 2021-01-31 @@ -2122,7 +2122,7 @@ To migrate to the new setup, expect a few minutes of downtime, while you follow 2. Generate a strong password to be used for your superuser Postgres user (called `matrix`). You can use `pwgen -s 64 1` to generate it, or some other tool. The **maximum length** for a Postgres password is 100 bytes (characters). Don't go crazy! -3. Update your playbook's `inventory/host_vars/matrix.DOMAIN/vars.yml` file, adding a line like this: +3. Update your playbook's `inventory/host_vars/matrix.example.com/vars.yml` file, adding a line like this: ```yaml matrix_postgres_connection_password: 'YOUR_POSTGRES_PASSWORD_HERE' ``` @@ -2404,11 +2404,11 @@ To learn more, follow our [Dynamic DNS docs page](docs/configuring-playbook-dyna # 2020-10-28 -## (Compatibility Break) https://matrix.DOMAIN/ now redirects to https://element.DOMAIN/ +## (Compatibility Break) https://matrix.example.com/ now redirects to https://element.example.com/ -Until now, we used to serve a static page coming from Synapse at `https://matrix.DOMAIN/`. This page was not very useful to anyone. +Until now, we used to serve a static page coming from Synapse at `https://matrix.example.com/`. This page was not very useful to anyone. -Since `matrix.DOMAIN` may be accessed by regular users in certain conditions, it's probably better to redirect them to a better place (e.g. to the [Element](docs/configuring-playbook-client-element.md) client). +Since `matrix.example.com` may be accessed by regular users in certain conditions, it's probably better to redirect them to a better place (e.g. to the [Element](docs/configuring-playbook-client-element.md) client). If Element is installed (`matrix_client_element_enabled: true`, which it is by default), we now redirect people to it, instead of showing them a Synapse static page. @@ -2420,7 +2420,7 @@ To restore the old behavior of not redirecting anywhere and serving the Synapse ## (Compatibility Break) /_synapse/admin is no longer publicly exposed by default -We used to expose the Synapse Admin APIs publicly (at `https://matrix.DOMAIN/_synapse/admin`). +We used to expose the Synapse Admin APIs publicly (at `https://matrix.example.com/_synapse/admin`). These APIs require authentication with a valid access token, so it's not that big a deal to expose them. However, following [official Synapse's reverse-proxying recommendations](https://github.com/element-hq/synapse/blob/master/docs/reverse_proxy.md#synapse-administration-endpoints), we're no longer exposing `/_synapse/admin` by default. diff --git a/docs/configuring-captcha.md b/docs/configuring-captcha.md index 1989d66ee..8d46891d0 100644 --- a/docs/configuring-captcha.md +++ b/docs/configuring-captcha.md @@ -16,7 +16,7 @@ Must be a reCAPTCHA **v2** key using the "I'm not a robot" Checkbox option ### Setting ReCaptcha keys -Once registered as above, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Once registered as above, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml # for Synapse diff --git a/docs/configuring-playbook-alertmanager-receiver.md b/docs/configuring-playbook-alertmanager-receiver.md index fbd50e85f..b7952c3bc 100644 --- a/docs/configuring-playbook-alertmanager-receiver.md +++ b/docs/configuring-playbook-alertmanager-receiver.md @@ -10,7 +10,7 @@ This service is meant to be used with an external [Alertmanager](https://prometh ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yml matrix_alertmanager_receiver_enabled: true @@ -33,10 +33,10 @@ matrix_alertmanager_receiver_config_matrix_access_token: '' # Optionally, configure some mappings (URL-friendly room name -> actual Matrix room ID). # # If you don't configure mappings, you can still deliver alerts using URLs like this: -# https://matrix.DOMAIN/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/!some-room-id:example.com +# https://matrix.example.com/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/!some-room-id:example.com # # If a mapping like the one below is configured, you can deliver alerts using friendlier URLs like this: -# https://matrix.DOMAIN/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/some-room-name +# https://matrix.example.com/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/some-room-name matrix_alertmanager_receiver_config_matrix_room_mapping: some-room-name: "!some-room-id:{{ matrix_domain }}" ``` @@ -89,6 +89,6 @@ route: - receiver: matrix ``` -.. where `URL_HERE` looks like `https://matrix.DOMAIN/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/some-room-name` or `https://matrix.DOMAIN/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/!some-room-id:DOMAIN`. +.. where `URL_HERE` looks like `https://matrix.example.com/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/some-room-name` or `https://matrix.example.com/matrix-alertmanager-receiver-RANDOM_VALUE_HERE/alert/!some-room-id:example.com`. This bot does **not** accept room invitations automatically (like many other bots do). To deliver messages to rooms, **the bot must be joined to all rooms manually** - see Step 5 of the [Account and room preparation](#account-and-room-preparation) section. diff --git a/docs/configuring-playbook-appservice-double-puppet.md b/docs/configuring-playbook-appservice-double-puppet.md index 5e0886a30..814f34b9a 100644 --- a/docs/configuring-playbook-appservice-double-puppet.md +++ b/docs/configuring-playbook-appservice-double-puppet.md @@ -8,7 +8,7 @@ Previously, bridges supported performing [double-puppeting](https://docs.mau.fi/ ## Adjusting the playbook configuration -To enable the Appservice Double Puppet service, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the Appservice Double Puppet service, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yml matrix_appservice_double_puppet_enabled: true diff --git a/docs/configuring-playbook-appservice-draupnir-for-all.md b/docs/configuring-playbook-appservice-draupnir-for-all.md index 6205fd872..760c3e751 100644 --- a/docs/configuring-playbook-appservice-draupnir-for-all.md +++ b/docs/configuring-playbook-appservice-draupnir-for-all.md @@ -38,7 +38,7 @@ Give the room from step 1 an alias. This alias can be anything you want and its ### 3. Adjusting the playbook configuration. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): You must replace `ALIAS_FROM_STEP_2_GOES_HERE` with the alias you created in step 2. @@ -83,7 +83,7 @@ You can refer to the upstream [documentation](https://github.com/the-draupnir-pr Please note that Config extension does not affect the appservices config as this config is not extensible in current Draupnir anyways. Config extension instead touches the config passed to the Draupnirs that your Appservice creates. So for example below makes all provisioned Draupnirs protect all joined rooms. -You can configure additional options by adding the `matrix_appservice_draupnir_for_all_extension_yaml` variable to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file. +You can configure additional options by adding the `matrix_appservice_draupnir_for_all_extension_yaml` variable to your `inventory/host_vars/matrix.example.com/vars.yml` file. For example to change draupnir's `protectAllJoinedRooms` option to `true` you would add the following to your `vars.yml` file. diff --git a/docs/configuring-playbook-backup-borg.md b/docs/configuring-playbook-backup-borg.md index a1158b5e5..cf5f66482 100644 --- a/docs/configuring-playbook-backup-borg.md +++ b/docs/configuring-playbook-backup-borg.md @@ -35,7 +35,7 @@ cat PUBKEY | ssh USER@HOST 'dd of=.ssh/authorized_keys oflag=append conv=notrunc ## Adjusting the playbook configuration -Minimal working configuration (`inventory/host_vars/matrix.DOMAIN/vars.yml`) to enable borg backup: +Minimal working configuration (`inventory/host_vars/matrix.example.com/vars.yml`) to enable borg backup: ```yaml backup_borg_enabled: true diff --git a/docs/configuring-playbook-base-domain-serving.md b/docs/configuring-playbook-base-domain-serving.md index e294a672c..f999d50fc 100644 --- a/docs/configuring-playbook-base-domain-serving.md +++ b/docs/configuring-playbook-base-domain-serving.md @@ -1,7 +1,7 @@ # Serving the base domain -This playbook sets up services on your Matrix server (`matrix.DOMAIN`). -To have this server officially be responsible for Matrix services for the base domain (`DOMAIN`), you need to set up [Server Delegation](howto-server-delegation.md). +This playbook sets up services on your Matrix server (`matrix.example.com`). +To have this server officially be responsible for Matrix services for the base domain (`example.com`), you need to set up [Server Delegation](howto-server-delegation.md). This is normally done by [configuring well-known](configuring-well-known.md) files on the base domain. People who don't have a separate server to dedicate to the base domain have trouble arranging this. @@ -14,7 +14,7 @@ Usually, there are 2 options: This documentation page tells you how to do the latter. With some easy changes, we make it possible to serve the base domain from the Matrix server via the integrated webserver. -Just **adjust your DNS records**, so that your base domain is pointed to the Matrix server's IP address (using a DNS `A` record) **and then add the following configuration** to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Just **adjust your DNS records**, so that your base domain is pointed to the Matrix server's IP address (using a DNS `A` record) **and then add the following configuration** to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_static_files_container_labels_base_domain_enabled: true @@ -26,7 +26,7 @@ Doing this, the playbook will: - serve the `/.well-known/matrix/*` files which are necessary for [Federation Server Discovery](configuring-well-known.md#introduction-to-client-server-discovery) (also see [Server Delegation](howto-server-delegation.md)) and [Client-Server discovery](configuring-well-known.md#introduction-to-client-server-discovery) -- serve a simple homepage at `https://DOMAIN` with content `Hello from DOMAIN` (configurable via the `matrix_static_files_file_index_html_template` variable). You can also [serve a more complicated static website](#serving-a-static-website-at-the-base-domain). +- serve a simple homepage at `https://example.com` with content `Hello from example.com` (configurable via the `matrix_static_files_file_index_html_template` variable). You can also [serve a more complicated static website](#serving-a-static-website-at-the-base-domain). ## Serving a static website at the base domain @@ -43,7 +43,7 @@ matrix_static_files_container_labels_base_domain_enabled: true # Prevent the default index.html file from being installed matrix_static_files_file_index_html_enabled: false -# Disable the automatic redirectin of `https://DOMAIN/` to `https://matrix.DOMAIN/`. +# Disable the automatic redirectin of `https://example.com/` to `https://matrix.example.com/`. # This gets automatically enabled when you disable `matrix_static_files_file_index_html_enabled`, as we're doing above. matrix_static_files_container_labels_base_domain_root_path_redirection_enabled: false ``` @@ -65,7 +65,7 @@ You have 2 options. - [configuring Matrix Delegation via well-known](./configuring-well-known.md) **Another way is to serve the base domain from another (your own) container on the Matrix server**. This involves: -- telling the playbook to only serve `BASE_DOMAIN/.well-known/matrix` files by adjusting your `vars.yml` configuration like this: +- telling the playbook to only serve `example.com/.well-known/matrix` files by adjusting your `vars.yml` configuration like this: - keep `matrix_static_files_container_labels_base_domain_enabled: true` - add an extra: `matrix_static_files_container_labels_base_domain_traefik_path_prefix: /.well-known/matrix` - building and running a new container on the Matrix server: diff --git a/docs/configuring-playbook-bot-baibot.md b/docs/configuring-playbook-bot-baibot.md index 86785d3c3..5b3c5af4d 100644 --- a/docs/configuring-playbook-bot-baibot.md +++ b/docs/configuring-playbook-bot-baibot.md @@ -33,7 +33,7 @@ Depending on your current `vars.yml` file and desired configuration, **you may r ### Base configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_baibot_enabled: true @@ -82,7 +82,7 @@ To specify who is considered a bot [👮‍♂️ Administrator](https://github. If `matrix_admin` is already configured in your `vars.yml` configuration, you can skip this section. -**If necessary**, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +**If necessary**, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yml # Uncomment to add one or more admins to this bridge: @@ -111,7 +111,7 @@ Configuring `matrix_bot_baibot_config_initial_global_config_user_patterns` is op **Note**: Once initially configured, the allowed users list **cannot be managed via Ansible anymore**. It can only be managed subsequently via bot commands. -**If necessary**, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +**If necessary**, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yml # Uncomment and adjust the bot users if necessary: @@ -391,7 +391,7 @@ just run-tags install-all,ensure-matrix-users-created,start ## Usage -To use the bot, invite the `@baibot:DOMAIN` bot user into a room. +To use the bot, invite the `@baibot:example.com` bot user into a room. If you're an allowed bot [👥 user](https://github.com/etkecc/baibot/blob/main/docs/access.md#user) (see [👥 Initial users configuration](#-initial-users-configuration)), the bot will accept your invitation and join the room. diff --git a/docs/configuring-playbook-bot-buscarron.md b/docs/configuring-playbook-bot-buscarron.md index e04ce58e2..fb01bb2ae 100644 --- a/docs/configuring-playbook-bot-buscarron.md +++ b/docs/configuring-playbook-bot-buscarron.md @@ -7,12 +7,12 @@ Buscarron is bot that receives HTTP POST submissions of web forms and forwards t ## Decide on a domain and path -By default, Buscarron is configured to use its own dedicated domain (`buscarron.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Buscarron is configured to use its own dedicated domain (`buscarron.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: ```yaml -# Switch to the domain used for Matrix services (`matrix.DOMAIN`), +# Switch to the domain used for Matrix services (`matrix.example.com`), # so we won't need to add additional DNS records for Buscarron. matrix_bot_buscarron_hostname: "{{ matrix_server_fqn_matrix }}" @@ -30,7 +30,7 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_buscarron_enabled: true @@ -43,9 +43,9 @@ matrix_bot_buscarron_password: PASSWORD_FOR_THE_BOT # Adjust accepted forms matrix_bot_buscarron_forms: - - name: contact # (mandatory) Your form name, will be used as endpoint, eg: buscarron.DOMAIN/contact + - name: contact # (mandatory) Your form name, will be used as endpoint, eg: buscarron.example.com/contact room: "!yourRoomID:{{ matrix_domain }}" # (mandatory) Room ID where form submission will be posted - redirect: https://DOMAIN # (mandatory) To what page user will be redirected after the form submission + redirect: https://example.com # (mandatory) To what page user will be redirected after the form submission ratelimit: 1r/m # (optional) rate limit of the form, format: r/, eg: 1r/s or 54r/m hasemail: 1 # (optional) form has "email" field that should be validated extensions: [] # (optional) list of form extensions (not used yet) @@ -71,10 +71,10 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use ## Usage -To use the bot, invite the `@bot.buscarron:DOMAIN` to the room you specified in a config, after that any point your form to the form url, example for the `contact` form: +To use the bot, invite the `@bot.buscarron:example.com` to the room you specified in a config, after that any point your form to the form url, example for the `contact` form: ```html -
+
``` diff --git a/docs/configuring-playbook-bot-chatgpt.md b/docs/configuring-playbook-bot-chatgpt.md index eace08d66..100b1060c 100644 --- a/docs/configuring-playbook-bot-chatgpt.md +++ b/docs/configuring-playbook-bot-chatgpt.md @@ -31,7 +31,7 @@ To make sure the bot can read encrypted messages, it will need an encryption key ## 3. Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_bot_chatgpt_enabled: true @@ -66,6 +66,6 @@ ansible-playbook -i inventory/hosts setup.yml --tags=install-all,start ## Usage -To use the bot, invite the `@bot.chatgpt:DOMAIN` to the room you specified in a config, after that start speaking to it, use the prefix if you configured one or mention the bot. +To use the bot, invite the `@bot.chatgpt:example.com` to the room you specified in a config, after that start speaking to it, use the prefix if you configured one or mention the bot. You can also refer to the upstream [documentation](https://github.com/matrixgpt/matrix-chatgpt-bot). diff --git a/docs/configuring-playbook-bot-draupnir.md b/docs/configuring-playbook-bot-draupnir.md index 95540ffe9..a591f96ed 100644 --- a/docs/configuring-playbook-bot-draupnir.md +++ b/docs/configuring-playbook-bot-draupnir.md @@ -47,9 +47,9 @@ Using your own account, create a new invite only room that you will use to manag If you make the management room encrypted (E2EE), then you MUST enable and use Pantalaimon (see below). -Once you have created the room you need to copy the room ID so you can tell the bot to use that room. In Element you can do this by going to the room's settings, clicking Advanced, and then copying the internal room ID. The room ID will look something like `!QvgVuKq0ha8glOLGMG:DOMAIN`. +Once you have created the room you need to copy the room ID so you can tell the bot to use that room. In Element you can do this by going to the room's settings, clicking Advanced, and then copying the internal room ID. The room ID will look something like `!QvgVuKq0ha8glOLGMG:example.com`. -Finally invite the `@bot.draupnir:DOMAIN` account you created earlier into the room. +Finally invite the `@bot.draupnir:example.com` account you created earlier into the room. ## 5. Adjusting the playbook configuration @@ -60,7 +60,7 @@ Decide whether you want Draupnir to be capable of operating in end-to-end encryp When using Pantalaimon, Draupnir will log in to its bot account itself through Pantalaimon, so configure its username and password. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml # Enable Pantalaimon. See docs/configuring-playbook-pantalaimon.md @@ -95,7 +95,7 @@ matrix_bot_draupnir_raw_homeserver_url: "{{ matrix_addons_homeserver_client_api_ When NOT using Pantalaimon, Draupnir does not log in by itself and you must give it an access token for its bot account. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): You must replace `ACCESS_TOKEN_FROM_STEP_2_GOES_HERE` and `ROOM_ID_FROM_STEP_4_GOES_HERE` with the your own values. @@ -135,7 +135,7 @@ Draupnir can be told to self-join public rooms, but it's better to follow this f 2. [Give the bot permissions to do its job](#giving-draupnir-permissions-to-do-its-job) -3. Tell it to protect the room (using the [rooms command](https://the-draupnir-project.github.io/draupnir-documentation/moderator/managing-protected-rooms#using-the-draupnir-rooms-command)) by sending the following command to the Management Room: `!draupnir rooms add !ROOM_ID:DOMAIN` +3. Tell it to protect the room (using the [rooms command](https://the-draupnir-project.github.io/draupnir-documentation/moderator/managing-protected-rooms#using-the-draupnir-rooms-command)) by sending the following command to the Management Room: `!draupnir rooms add !ROOM_ID:example.com` To have Draupnir provide useful room protection, you need do to a bit more work (at least the first time around). You may wish to [Subscribe to a public policy list](#subscribing-to-a-public-policy-list), [Create your own own policy and rules](#creating-your-own-policy-lists-and-rules) and [Enabling built-in protections](#enabling-built-in-protections). @@ -158,7 +158,7 @@ You can tell Draupnir to subscribe to it by sending the following command to the We also recommend **creating your own policy lists** with the [list create](https://the-draupnir-project.github.io/draupnir-documentation/moderator/managing-policy-lists#using-draupnirs-list-create-command-to-create-a-policy-room) command. -You can do so by sending the following command to the Management Room: `!draupnir list create my-bans my-bans-bl`. This will create a policy list having a name (shortcode) of `my-bans` and stored in a public `#my-bans-bl:DOMAIN` room on your server. As soon as you run this command, the bot will invite you to the policy list room. +You can do so by sending the following command to the Management Room: `!draupnir list create my-bans my-bans-bl`. This will create a policy list having a name (shortcode) of `my-bans` and stored in a public `#my-bans-bl:example.com` room on your server. As soon as you run this command, the bot will invite you to the policy list room. A policy list does nothing by itself, so the next step is **adding some rules to your policy list**. Policies target a so-called `entity` (one of: `user`, `room` or `server`). These entities are mentioned on the [policy lists](https://the-draupnir-project.github.io/draupnir-documentation/concepts/policy-lists) documentation page and in the Matrix Spec [here](https://spec.matrix.org/v1.11/client-server-api/#mban-recommendation). @@ -171,7 +171,7 @@ To create rules, you run commands in the Management Room (**not** in the policy As a result of running these commands, you may observe: -- Draupnir creating `m.policy.rule.user` state events in the `#my-bans-bl:DOMAIN` room on your server +- Draupnir creating `m.policy.rule.user` state events in the `#my-bans-bl:example.com` room on your server - applying these rules against all rooms that Draupnir is an Administrator in You can undo bans with the [unban command](https://the-draupnir-project.github.io/draupnir-documentation/moderator/managing-users#the-unban-command). @@ -193,7 +193,7 @@ To **disable a given protection**, send a command like this: `!draupnir disable ## Extending the configuration -You can configure additional options by adding the `matrix_bot_draupnir_configuration_extension_yaml` variable to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file. +You can configure additional options by adding the `matrix_bot_draupnir_configuration_extension_yaml` variable to your `inventory/host_vars/matrix.example.com/vars.yml` file. For example to change draupnir's `recordIgnoredInvites` option to `true` you would add the following to your `vars.yml` file. diff --git a/docs/configuring-playbook-bot-go-neb.md b/docs/configuring-playbook-bot-go-neb.md index 5e01d83dd..8e5e08a5f 100644 --- a/docs/configuring-playbook-bot-go-neb.md +++ b/docs/configuring-playbook-bot-go-neb.md @@ -26,12 +26,12 @@ Once the user is created you can [obtain an access token](obtaining-access-token ## Decide on a domain and path -By default, Go-NEB is configured to use its own dedicated domain (`goneb.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Go-NEB is configured to use its own dedicated domain (`goneb.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: ```yaml -# Switch to the domain used for Matrix services (`matrix.DOMAIN`), +# Switch to the domain used for Matrix services (`matrix.example.com`), # so we won't need to add additional DNS records for Go-NEB. matrix_bot_go_neb_hostname: "{{ matrix_server_fqn_matrix }}" @@ -49,7 +49,7 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_bot_go_neb_enabled: true diff --git a/docs/configuring-playbook-bot-honoroit.md b/docs/configuring-playbook-bot-honoroit.md index 9f88ee8dd..496dc1b16 100644 --- a/docs/configuring-playbook-bot-honoroit.md +++ b/docs/configuring-playbook-bot-honoroit.md @@ -9,7 +9,7 @@ See the project's [documentation](https://github.com/etkecc/honoroit#how-it-look ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_honoroit_enabled: true @@ -46,7 +46,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use ## Usage -To use the bot, invite the `@honoroit:DOMAIN` to the room you specified in config, after that any matrix user can send a message to the `@honoroit:DOMAIN` to start a new thread in that room. +To use the bot, invite the `@honoroit:example.com` to the room you specified in config, after that any matrix user can send a message to the `@honoroit:example.com` to start a new thread in that room. Send `!ho help` to the room to see the bot's help menu for additional commands. diff --git a/docs/configuring-playbook-bot-matrix-registration-bot.md b/docs/configuring-playbook-bot-matrix-registration-bot.md index 5ce317ed6..17c12e8e2 100644 --- a/docs/configuring-playbook-bot-matrix-registration-bot.md +++ b/docs/configuring-playbook-bot-matrix-registration-bot.md @@ -11,12 +11,12 @@ does and why it might be useful to you. ## Configuration -To enable the bot, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bot, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_matrix_registration_bot_enabled: true -# By default, the playbook will set use the bot with a username like this: `@bot.matrix-registration-bot:DOMAIN`. +# By default, the playbook will set use the bot with a username like this: `@bot.matrix-registration-bot:example.com`. # Uncomment and adjust this part if you'd like to use a username different than the default # matrix_bot_matrix_registration_bot_matrix_user_id_localpart: bot.matrix-registration-bot @@ -38,7 +38,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -To use the bot, start a chat with `@bot.matrix-registration-bot:DOMAIN` (where `DOMAIN` is your base domain, not the `matrix.` domain). +To use the bot, start a chat with `@bot.matrix-registration-bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). In this room send `help` and the bot will reply with all options. diff --git a/docs/configuring-playbook-bot-matrix-reminder-bot.md b/docs/configuring-playbook-bot-matrix-reminder-bot.md index 3336d191a..2bce34765 100644 --- a/docs/configuring-playbook-bot-matrix-reminder-bot.md +++ b/docs/configuring-playbook-bot-matrix-reminder-bot.md @@ -9,7 +9,7 @@ See the project's [documentation](https://github.com/anoadragon453/matrix-remind ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_matrix_reminder_bot_enabled: true @@ -42,9 +42,9 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use ## Usage -To use the bot, start a chat with `@bot.matrix-reminder-bot:DOMAIN` (where `example.com` is your base domain, not the `matrix.` domain). +To use the bot, start a chat with `@bot.matrix-reminder-bot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). -You can also add the bot to any existing Matrix room (`/invite @bot.matrix-reminder-bot:DOMAIN`). +You can also add the bot to any existing Matrix room (`/invite @bot.matrix-reminder-bot:example.com`). Basic usage is like this: `!remindme in 2 minutes; This is a test` diff --git a/docs/configuring-playbook-bot-maubot.md b/docs/configuring-playbook-bot-maubot.md index f90dd6bf3..f435492c3 100644 --- a/docs/configuring-playbook-bot-maubot.md +++ b/docs/configuring-playbook-bot-maubot.md @@ -10,7 +10,7 @@ does and why it might be useful to you. ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_maubot_enabled: true diff --git a/docs/configuring-playbook-bot-mjolnir.md b/docs/configuring-playbook-bot-mjolnir.md index dd7681d06..589850ee4 100644 --- a/docs/configuring-playbook-bot-mjolnir.md +++ b/docs/configuring-playbook-bot-mjolnir.md @@ -41,9 +41,9 @@ Using your own account, create a new invite only room that you will use to manag If you make the management room encrypted (E2EE), then you MUST enable and use Pantalaimon (see below). -Once you have created the room you need to copy the room ID so you can tell the bot to use that room. In Element you can do this by going to the room's settings, clicking Advanced, and then copying the internal room ID. The room ID will look something like `!QvgVuKq0ha8glOLGMG:DOMAIN`. +Once you have created the room you need to copy the room ID so you can tell the bot to use that room. In Element you can do this by going to the room's settings, clicking Advanced, and then copying the internal room ID. The room ID will look something like `!QvgVuKq0ha8glOLGMG:example.com`. -Finally invite the `@bot.mjolnir:DOMAIN` account you created earlier into the room. +Finally invite the `@bot.mjolnir:example.com` account you created earlier into the room. ## 5. Adjusting the playbook configuration @@ -54,7 +54,7 @@ Decide whether you want Mjolnir to be capable of operating in end-to-end encrypt When using Pantalaimon, Mjolnir will log in to its bot account itself through Pantalaimon, so configure its username and password. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml # Enable Pantalaimon. See docs/configuring-playbook-pantalaimon.md @@ -89,7 +89,7 @@ matrix_bot_mjolnir_raw_homeserver_url: "{{ matrix_addons_homeserver_client_api_u When NOT using Pantalaimon, Mjolnir does not log in by itself and you must give it an access token for its bot account. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): You must replace `ACCESS_TOKEN_FROM_STEP_2_GOES_HERE` and `ROOM_ID_FROM_STEP_4_GOES_HERE` with the your own values. @@ -103,7 +103,7 @@ matrix_bot_mjolnir_management_room: "ROOM_ID_FROM_STEP_4_GOES_HERE" ## 6. Adding Mjolnir synapse antispam module (optional) -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml @@ -128,7 +128,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start You can refer to the upstream [documentation](https://github.com/matrix-org/mjolnir) for additional ways to use and configure Mjolnir. Check out their [quickstart guide](https://github.com/matrix-org/mjolnir#quickstart-guide) for some basic commands you can give to the bot. -You can configure additional options by adding the `matrix_bot_mjolnir_configuration_extension_yaml` variable to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file. +You can configure additional options by adding the `matrix_bot_mjolnir_configuration_extension_yaml` variable to your `inventory/host_vars/matrix.example.com/vars.yml` file. For example to change Mjolnir's `recordIgnoredInvites` option to `true` you would add the following to your `vars.yml` file. diff --git a/docs/configuring-playbook-bot-postmoogle.md b/docs/configuring-playbook-bot-postmoogle.md index 35f141a4d..4af99aba9 100644 --- a/docs/configuring-playbook-bot-postmoogle.md +++ b/docs/configuring-playbook-bot-postmoogle.md @@ -25,7 +25,7 @@ These port numbers are configurable via the `matrix_bot_postmoogle_smtp_host_bin ### Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_bot_postmoogle_enabled: true @@ -69,7 +69,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use ## Usage -To use the bot, invite the `@postmoogle:DOMAIN` bot user into a room you want to use as a mailbox. +To use the bot, invite the `@postmoogle:example.com` bot user into a room you want to use as a mailbox. Then send `!pm mailbox NAME` to expose this Matrix room as an inbox with the email address `NAME@matrix.domain`. Emails sent to that email address will be forwarded to the room. diff --git a/docs/configuring-playbook-bridge-appservice-irc.md b/docs/configuring-playbook-bridge-appservice-irc.md index 4da559790..82623b998 100644 --- a/docs/configuring-playbook-bridge-appservice-irc.md +++ b/docs/configuring-playbook-bridge-appservice-irc.md @@ -8,7 +8,7 @@ See the project's [documentation](https://github.com/matrix-org/matrix-appservic ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_appservice_irc_enabled: true diff --git a/docs/configuring-playbook-bridge-appservice-kakaotalk.md b/docs/configuring-playbook-bridge-appservice-kakaotalk.md index 4a004eb1a..cbc52a6cc 100644 --- a/docs/configuring-playbook-bridge-appservice-kakaotalk.md +++ b/docs/configuring-playbook-bridge-appservice-kakaotalk.md @@ -9,7 +9,7 @@ See the project's [documentation](https://src.miscworks.net/fair/matrix-appservi ## Installing -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_appservice_kakaotalk_enabled: true diff --git a/docs/configuring-playbook-bridge-appservice-slack.md b/docs/configuring-playbook-bridge-appservice-slack.md index 5c970dcc5..4e1619b66 100644 --- a/docs/configuring-playbook-bridge-appservice-slack.md +++ b/docs/configuring-playbook-bridge-appservice-slack.md @@ -12,7 +12,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se 1. Create a new Matrix room to act as the administration control room. Note its internal room ID. This can be done in Element by sending a message, opening the options for that message and choosing "view source". The room ID will be displayed near the top. -2. Enable the bridge by adding the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +2. Enable the bridge by adding the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_appservice_slack_enabled: true @@ -40,7 +40,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se 6. Invite the bridge bot user into the admin room: ``` - /invite @slackbot:MY.DOMAIN + /invite @slackbot:MY.example.com ``` Note that the bot's domain is your server's domain **without the `matrix.` prefix.** @@ -53,7 +53,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se Click on bot users and add a new bot user. We will use this account to bridge the the rooms. -8. Click on Event Subscriptions and enable them and use the request url `https://matrix.DOMAIN/appservice-slack`. Then add the following events and save: +8. Click on Event Subscriptions and enable them and use the request url `https://matrix.example.com/appservice-slack`. Then add the following events and save: Bot User Events: @@ -81,7 +81,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se * Create a Matrix room in the usual manner for your client. Take a note of its Matrix room ID - it will look something like !aBcDeF:example.com. - * Invite the bot user to both the Slack and Matrix channels you would like to bridge using `/invite @matrixbot` for Slack and `/invite @slackbot:MY.DOMAIN` for Matrix. + * Invite the bot user to both the Slack and Matrix channels you would like to bridge using `/invite @matrixbot` for Slack and `/invite @slackbot:MY.example.com` for Matrix. * Determine the "channel ID" that Slack uses to identify the channel. You can see it when you open a given Slack channel in a browser. The URL reads like this: `https://app.slack.com/client/XXX//details/`. diff --git a/docs/configuring-playbook-bridge-beeper-linkedin.md b/docs/configuring-playbook-bridge-beeper-linkedin.md index 3aaa01520..5ba0233ec 100644 --- a/docs/configuring-playbook-bridge-beeper-linkedin.md +++ b/docs/configuring-playbook-bridge-beeper-linkedin.md @@ -6,7 +6,7 @@ See the project's [documentation](https://github.com/beeper/linkedin/blob/master ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_beeper_linkedin_enabled: true diff --git a/docs/configuring-playbook-bridge-go-skype-bridge.md b/docs/configuring-playbook-bridge-go-skype-bridge.md index c9001636a..10a244aa0 100644 --- a/docs/configuring-playbook-bridge-go-skype-bridge.md +++ b/docs/configuring-playbook-bridge-go-skype-bridge.md @@ -7,7 +7,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the [Skype](https://www.skype.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Skype](https://www.skype.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_go_skype_bridge_enabled: true diff --git a/docs/configuring-playbook-bridge-heisenbridge.md b/docs/configuring-playbook-bridge-heisenbridge.md index b6eb23634..75c6b1315 100644 --- a/docs/configuring-playbook-bridge-heisenbridge.md +++ b/docs/configuring-playbook-bridge-heisenbridge.md @@ -10,7 +10,7 @@ See the project's [README](https://github.com/hifi/heisenbridge/blob/master/READ Below are the common configuration options that you may want to set, exhaustive list is in [the bridge's defaults var file](../roles/custom/matrix-bridge-heisenbridge/defaults/main.yml). -At a minimum, you only need to enable the bridge to get it up and running (`inventory/host_vars/matrix.DOMAIN/vars.yml`): +At a minimum, you only need to enable the bridge to get it up and running (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_heisenbridge_enabled: true @@ -22,7 +22,7 @@ matrix_heisenbridge_owner: "@you:your-homeserver" matrix_heisenbridge_identd_enabled: true ``` -By default, Heisenbrdige would be exposed on the Matrix domain (`matrix.DOMAIN`, as specified in `matrix_server_fqn_matrix`) under the `/heisenbridge` path prefix. It would handle media requests there (see the [release notes for Heisenbridge v1.15.0](https://github.com/hifi/heisenbridge/releases/tag/v1.15.0)). +By default, Heisenbrdige would be exposed on the Matrix domain (`matrix.example.com`, as specified in `matrix_server_fqn_matrix`) under the `/heisenbridge` path prefix. It would handle media requests there (see the [release notes for Heisenbridge v1.15.0](https://github.com/hifi/heisenbridge/releases/tag/v1.15.0)). That's it! A registration file is automatically generated during the setup phase. diff --git a/docs/configuring-playbook-bridge-hookshot.md b/docs/configuring-playbook-bridge-hookshot.md index 812697b9c..3bb1ba0ab 100644 --- a/docs/configuring-playbook-bridge-hookshot.md +++ b/docs/configuring-playbook-bridge-hookshot.md @@ -31,7 +31,7 @@ Should the crypto store be corrupted, you can reset it by executing this Ansible ## Usage -Create a room and invite the Hookshot bot (`@hookshot:DOMAIN`) to it. +Create a room and invite the Hookshot bot (`@hookshot:example.com`) to it. Make sure the bot is able to send state events (usually the Moderator power level in clients). @@ -92,7 +92,7 @@ Metrics are **only enabled by default** if the builtin [Prometheus](configuring- To explicitly enable metrics, use `matrix_hookshot_metrics_enabled: true`. This only exposes metrics over the container network, however. -**To collect metrics from an external Prometheus server**, besides enabling metrics as described above, you will also need to enable metrics exposure on `https://matrix.DOMAIN/metrics/hookshot` by: +**To collect metrics from an external Prometheus server**, besides enabling metrics as described above, you will also need to enable metrics exposure on `https://matrix.example.com/metrics/hookshot` by: - either enabling metrics exposure for Hookshot via `matrix_hookshot_metrics_proxying_enabled: true` - or enabling metrics exposure for all services via `matrix_metrics_exposure_enabled: true` diff --git a/docs/configuring-playbook-bridge-matrix-bridge-sms.md b/docs/configuring-playbook-bridge-matrix-bridge-sms.md index fe883abb5..f698ad986 100644 --- a/docs/configuring-playbook-bridge-matrix-bridge-sms.md +++ b/docs/configuring-playbook-bridge-matrix-bridge-sms.md @@ -8,7 +8,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_sms_bridge_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-discord.md b/docs/configuring-playbook-bridge-mautrix-discord.md index 184addf6b..d7da7878b 100644 --- a/docs/configuring-playbook-bridge-mautrix-discord.md +++ b/docs/configuring-playbook-bridge-mautrix-discord.md @@ -17,7 +17,7 @@ If this is a dealbreaker for you, consider using one of the other Discord bridge ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_discord_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-facebook.md b/docs/configuring-playbook-bridge-mautrix-facebook.md index e20d1e2e6..50d23a0fd 100644 --- a/docs/configuring-playbook-bridge-mautrix-facebook.md +++ b/docs/configuring-playbook-bridge-mautrix-facebook.md @@ -8,7 +8,7 @@ See the project's [documentation](https://github.com/mautrix/facebook/blob/maste ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_facebook_enabled: true @@ -98,7 +98,7 @@ The easiest way to do this may be to use [sshuttle](https://sshuttle.readthedocs Example command for proxying your traffic through the Matrix server: ``` -sshuttle -r root@matrix.DOMAIN:22 0/0 +sshuttle -r root@matrix.example.com:22 0/0 ``` Once connected, you should be able to verify that you're browsing the web through the Matrix server's IP by checking [icanhazip](https://icanhazip.com/). diff --git a/docs/configuring-playbook-bridge-mautrix-gmessages.md b/docs/configuring-playbook-bridge-mautrix-gmessages.md index e07646743..6b44eeeee 100644 --- a/docs/configuring-playbook-bridge-mautrix-gmessages.md +++ b/docs/configuring-playbook-bridge-mautrix-gmessages.md @@ -6,7 +6,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/go/gmessages/index ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_gmessages_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-googlechat.md b/docs/configuring-playbook-bridge-mautrix-googlechat.md index ed6270c8a..a62003cb2 100644 --- a/docs/configuring-playbook-bridge-mautrix-googlechat.md +++ b/docs/configuring-playbook-bridge-mautrix-googlechat.md @@ -6,7 +6,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/python/googlechat/ ## Adjusting the playbook configuration -To enable the [Google Chat](https://chat.google.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Google Chat](https://chat.google.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_googlechat_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-hangouts.md b/docs/configuring-playbook-bridge-mautrix-hangouts.md index 62770fe0b..198d4c923 100644 --- a/docs/configuring-playbook-bridge-mautrix-hangouts.md +++ b/docs/configuring-playbook-bridge-mautrix-hangouts.md @@ -8,7 +8,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/python/hangouts/in ## Adjusting the playbook configuration -To enable the [Google Hangouts](https://hangouts.google.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Google Hangouts](https://hangouts.google.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_hangouts_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-instagram.md b/docs/configuring-playbook-bridge-mautrix-instagram.md index 14d25f52f..ffafa25db 100644 --- a/docs/configuring-playbook-bridge-mautrix-instagram.md +++ b/docs/configuring-playbook-bridge-mautrix-instagram.md @@ -8,7 +8,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/python/instagram/i ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_instagram_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-meta-instagram.md b/docs/configuring-playbook-bridge-mautrix-meta-instagram.md index 0a644d049..f7809090d 100644 --- a/docs/configuring-playbook-bridge-mautrix-meta-instagram.md +++ b/docs/configuring-playbook-bridge-mautrix-meta-instagram.md @@ -23,7 +23,7 @@ Then, consider disabling the old bridge in your configuration, so it won't recre ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_meta_instagram_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-meta-messenger.md b/docs/configuring-playbook-bridge-mautrix-meta-messenger.md index ded925ce5..81aebfade 100644 --- a/docs/configuring-playbook-bridge-mautrix-meta-messenger.md +++ b/docs/configuring-playbook-bridge-mautrix-meta-messenger.md @@ -19,7 +19,7 @@ Then, consider disabling the old bridge in your configuration, so it won't recre ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_meta_messenger_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-signal.md b/docs/configuring-playbook-bridge-mautrix-signal.md index 16227a186..ec9d18024 100644 --- a/docs/configuring-playbook-bridge-mautrix-signal.md +++ b/docs/configuring-playbook-bridge-mautrix-signal.md @@ -10,7 +10,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/python/signal/inde ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_signal_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-slack.md b/docs/configuring-playbook-bridge-mautrix-slack.md index e2f00d467..43eaf274b 100644 --- a/docs/configuring-playbook-bridge-mautrix-slack.md +++ b/docs/configuring-playbook-bridge-mautrix-slack.md @@ -20,7 +20,7 @@ Note that neither of these methods are officially supported by Slack. [matrix-ap ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_slack_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-telegram.md b/docs/configuring-playbook-bridge-mautrix-telegram.md index a556dcffa..3fc98eda6 100644 --- a/docs/configuring-playbook-bridge-mautrix-telegram.md +++ b/docs/configuring-playbook-bridge-mautrix-telegram.md @@ -6,7 +6,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/python/telegram/in ## Adjusting the playbook configuration -You'll need to obtain API keys from [https://my.telegram.org/apps](https://my.telegram.org/apps) and then add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +You'll need to obtain API keys from [https://my.telegram.org/apps](https://my.telegram.org/apps) and then add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_telegram_enabled: true @@ -47,7 +47,7 @@ When using this method, **each user** that wishes to enable Double Puppeting nee You then need to start a chat with `@telegrambot:example.com` (where `example.com` is your base domain, not the `matrix.` domain). -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, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +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, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_telegram_bot_token: YOUR_TELEGRAM_BOT_TOKEN @@ -62,7 +62,7 @@ You might also want to give permissions to administrate the bot: matrix_mautrix_telegram_configuration_extension_yaml: | bridge: permissions: - '@user:DOMAIN': admin + '@user:example.com': admin ``` More details about permissions in this example: diff --git a/docs/configuring-playbook-bridge-mautrix-twitter.md b/docs/configuring-playbook-bridge-mautrix-twitter.md index 60c1a745f..fe08c77bf 100644 --- a/docs/configuring-playbook-bridge-mautrix-twitter.md +++ b/docs/configuring-playbook-bridge-mautrix-twitter.md @@ -8,7 +8,7 @@ See the project's [documentation](https://github.com/mautrix/twitter) to learn w ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_twitter_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-whatsapp.md b/docs/configuring-playbook-bridge-mautrix-whatsapp.md index ae1d2ea3a..d65075c83 100644 --- a/docs/configuring-playbook-bridge-mautrix-whatsapp.md +++ b/docs/configuring-playbook-bridge-mautrix-whatsapp.md @@ -6,7 +6,7 @@ See the project's [documentation](https://docs.mau.fi/bridges/go/whatsapp/index. ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_whatsapp_enabled: true diff --git a/docs/configuring-playbook-bridge-mautrix-wsproxy.md b/docs/configuring-playbook-bridge-mautrix-wsproxy.md index 93ed9a5ad..2bff1ecda 100644 --- a/docs/configuring-playbook-bridge-mautrix-wsproxy.md +++ b/docs/configuring-playbook-bridge-mautrix-wsproxy.md @@ -7,12 +7,12 @@ See the project's [documentation](https://github.com/mautrix/wsproxy#readme) to ## DNS -You need to create a `wsproxy.DOMAIN` DNS record pointing to your Matrix server (a `CNAME` pointing to `matrix.DOMAIN`) to use wsproxy. +You need to create a `wsproxy.example.com` DNS record pointing to your Matrix server (a `CNAME` pointing to `matrix.example.com`) to use wsproxy. The hostname is configurable via a `matrix_mautrix_wsproxy_hostname` variable. ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mautrix_wsproxy_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-discord.md b/docs/configuring-playbook-bridge-mx-puppet-discord.md index da987bf2e..56f05f307 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-discord.md +++ b/docs/configuring-playbook-bridge-mx-puppet-discord.md @@ -13,7 +13,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the [Discord](https://discordapp.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Discord](https://discordapp.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_discord_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-groupme.md b/docs/configuring-playbook-bridge-mx-puppet-groupme.md index ed38600e4..c10e386fc 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-groupme.md +++ b/docs/configuring-playbook-bridge-mx-puppet-groupme.md @@ -7,7 +7,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the [GroupMe](https://groupme.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [GroupMe](https://groupme.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_groupme_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-instagram.md b/docs/configuring-playbook-bridge-mx-puppet-instagram.md index 0a61d561f..b2546cb0a 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-instagram.md +++ b/docs/configuring-playbook-bridge-mx-puppet-instagram.md @@ -7,7 +7,7 @@ This allows you to bridge Instagram DirectMessages into Matrix. ## Adjusting the playbook configuration -To enable the [Instagram](https://www.instagram.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Instagram](https://www.instagram.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_instagram_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-slack.md b/docs/configuring-playbook-bridge-mx-puppet-slack.md index a2e2fa3c3..d5f784cc5 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-slack.md +++ b/docs/configuring-playbook-bridge-mx-puppet-slack.md @@ -10,11 +10,11 @@ See the project page to learn what it does and why it might be useful to you. ## Prerequisite -Follow the [OAuth credentials](https://github.com/Sorunome/mx-puppet-slack#option-2-oauth) instructions to create a new Slack app, setting the redirect URL to `https://matrix.DOMAIN/slack/oauth`. +Follow the [OAuth credentials](https://github.com/Sorunome/mx-puppet-slack#option-2-oauth) instructions to create a new Slack app, setting the redirect URL to `https://matrix.example.com/slack/oauth`. ## Adjusting the playbook configuration -To enable the [Slack](https://slack.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Slack](https://slack.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_slack_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-steam.md b/docs/configuring-playbook-bridge-mx-puppet-steam.md index 08b254259..60475929c 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-steam.md +++ b/docs/configuring-playbook-bridge-mx-puppet-steam.md @@ -7,7 +7,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the [Steam](https://steampowered.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Steam](https://steampowered.com/) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_steam_enabled: true diff --git a/docs/configuring-playbook-bridge-mx-puppet-twitter.md b/docs/configuring-playbook-bridge-mx-puppet-twitter.md index 0d567c56e..783999ff8 100644 --- a/docs/configuring-playbook-bridge-mx-puppet-twitter.md +++ b/docs/configuring-playbook-bridge-mx-puppet-twitter.md @@ -13,7 +13,7 @@ Make an app on [developer.twitter.com](https://developer.twitter.com/en/apps). ## Adjusting the playbook configuration -To enable the [Twitter](https://twitter.com) bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the [Twitter](https://twitter.com) bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_mx_puppet_twitter_enabled: true diff --git a/docs/configuring-playbook-bridge-wechat.md b/docs/configuring-playbook-bridge-wechat.md index c00b9a7fc..e5a1546c7 100644 --- a/docs/configuring-playbook-bridge-wechat.md +++ b/docs/configuring-playbook-bridge-wechat.md @@ -6,7 +6,7 @@ See the project page to learn what it does and why it might be useful to you. ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_wechat_enabled: true diff --git a/docs/configuring-playbook-cactus-comments.md b/docs/configuring-playbook-cactus-comments.md index 98ec896e8..f5e124c08 100644 --- a/docs/configuring-playbook-cactus-comments.md +++ b/docs/configuring-playbook-cactus-comments.md @@ -33,7 +33,7 @@ matrix_cactus_comments_enabled: true # matrix_synapse_allow_guest_access: true # matrix_dendrite_allow_guest_access: true -# This enables client assets static files serving on `https://matrix.DOMAIN/cactus-comments`. +# This enables client assets static files serving on `https://matrix.example.com/cactus-comments`. # When the backend (appservice) is enabled, this is also enabled automatically, # but we explicitly enable it here. matrix_cactus_comments_client_enabled: true diff --git a/docs/configuring-playbook-client-cinny.md b/docs/configuring-playbook-client-cinny.md index bcecff2d7..701d13fb6 100644 --- a/docs/configuring-playbook-client-cinny.md +++ b/docs/configuring-playbook-client-cinny.md @@ -6,11 +6,11 @@ Cinny can be installed alongside or instead of Element. ## DNS -You need to add a `cinny.DOMAIN` DNS record so that Cinny can be accessed. -By default Cinny will use https://cinny.DOMAIN so you will need to create an CNAME record +You need to add a `cinny.example.com` DNS record so that Cinny can be accessed. +By default Cinny will use https://cinny.example.com so you will need to create an CNAME record for `cinny`. See [Configuring DNS](configuring-dns.md). -If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (changing it to use your preferred domain): +If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (changing it to use your preferred domain): ```yaml matrix_server_fqn_cinny: "app.{{ matrix_domain }}" @@ -18,7 +18,7 @@ matrix_server_fqn_cinny: "app.{{ matrix_domain }}" ## Adjusting the playbook configuration -To enable Cinny, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable Cinny, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_client_cinny_enabled: true diff --git a/docs/configuring-playbook-client-hydrogen.md b/docs/configuring-playbook-client-hydrogen.md index 28ddb900a..2099299d5 100644 --- a/docs/configuring-playbook-client-hydrogen.md +++ b/docs/configuring-playbook-client-hydrogen.md @@ -6,11 +6,11 @@ Hydrogen can be installed alongside or instead of Element. ## DNS -You need to add a `hydrogen.DOMAIN` DNS record so that Hydrogen can be accessed. -By default Hydrogen will use https://hydrogen.DOMAIN so you will need to create an CNAME record +You need to add a `hydrogen.example.com` DNS record so that Hydrogen can be accessed. +By default Hydrogen will use https://hydrogen.example.com so you will need to create an CNAME record for `hydrogen`. See [Configuring DNS](configuring-dns.md). -If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (changing it to use your preferred domain): +If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (changing it to use your preferred domain): ```yaml matrix_server_fqn_hydrogen: "helium.{{ matrix_domain }}" @@ -18,7 +18,7 @@ matrix_server_fqn_hydrogen: "helium.{{ matrix_domain }}" ## Adjusting the playbook configuration -To enable Hydrogen, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable Hydrogen, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_client_hydrogen_enabled: true diff --git a/docs/configuring-playbook-client-schildichat.md b/docs/configuring-playbook-client-schildichat.md index 81fe411d1..5272723cf 100644 --- a/docs/configuring-playbook-client-schildichat.md +++ b/docs/configuring-playbook-client-schildichat.md @@ -8,11 +8,11 @@ SchildiChat can be installed alongside or instead of Element. ## DNS -You need to add a `schildichat.DOMAIN` DNS record so that SchildiChat can be accessed. -By default SchildiChat will use https://schildichat.DOMAIN so you will need to create an CNAME record +You need to add a `schildichat.example.com` DNS record so that SchildiChat can be accessed. +By default SchildiChat will use https://schildichat.example.com so you will need to create an CNAME record for `schildichat`. See [Configuring DNS](configuring-dns.md). -If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (changing it to use your preferred domain): +If you would like to use a different domain, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (changing it to use your preferred domain): ```yaml matrix_server_fqn_schildichat: "sc.{{ matrix_domain }}" @@ -20,7 +20,7 @@ matrix_server_fqn_schildichat: "sc.{{ matrix_domain }}" ## Adjusting the playbook configuration -To enable SchildiChat, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable SchildiChat, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_client_schildichat_enabled: true diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md index 045be3616..9deb41f27 100644 --- a/docs/configuring-playbook-dimension.md +++ b/docs/configuring-playbook-dimension.md @@ -10,7 +10,7 @@ If you're just installing Matrix services for the first time, please continue wi ## Decide on a domain and path -By default, Dimension is configured to use its own dedicated domain (`dimension.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Dimension is configured to use its own dedicated domain (`dimension.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: diff --git a/docs/configuring-playbook-dynamic-dns.md b/docs/configuring-playbook-dynamic-dns.md index bc58c2736..6d468a3c5 100644 --- a/docs/configuring-playbook-dynamic-dns.md +++ b/docs/configuring-playbook-dynamic-dns.md @@ -6,7 +6,7 @@ Most cloud providers / ISPs will charge you extra for a static IP address. If yo not hosting a highly reliable homeserver you can workaround this via dynamic DNS. To set this up, you'll need to get the username/password from your DNS provider. For google domains, this process is described [here](https://support.google.com/domains/answer/6147083). -After you've gotten the proper credentials you can add the following config to your `inventory/host_vars/matrix.DOMAIN/vars.yml`: +After you've gotten the proper credentials you can add the following config to your `inventory/host_vars/matrix.example.com/vars.yml`: ```yaml matrix_dynamic_dns_enabled: true diff --git a/docs/configuring-playbook-email.md b/docs/configuring-playbook-email.md index a7c500250..ab850e933 100644 --- a/docs/configuring-playbook-email.md +++ b/docs/configuring-playbook-email.md @@ -17,7 +17,7 @@ No matter whether you send email directly (the default) or you relay email throu ## Relaying email through another SMTP server -If you'd like to relay email through another SMTP server, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +If you'd like to relay email through another SMTP server, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml exim_relay_sender_address: "another.sender@example.com" diff --git a/docs/configuring-playbook-email2matrix.md b/docs/configuring-playbook-email2matrix.md index c410de559..ec9b78b6a 100644 --- a/docs/configuring-playbook-email2matrix.md +++ b/docs/configuring-playbook-email2matrix.md @@ -11,7 +11,7 @@ See the project's [documentation](https://github.com/devture/email2matrix/blob/m ### DNS configuration -It's not strictly necessary, but you may increase the chances that incoming emails reach your server by adding an `MX` record for `matrix.DOMAIN`, as described in the [Configuring DNS](configuring-dns.md) documentation page. +It's not strictly necessary, but you may increase the chances that incoming emails reach your server by adding an `MX` record for `matrix.example.com`, as described in the [Configuring DNS](configuring-dns.md) documentation page. ### Port availability @@ -43,7 +43,7 @@ In order for the sender user created above to be able to send messages to the ro ## Adjusting the playbook configuration -After doing the preparation steps above, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +After doing the preparation steps above, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_email2matrix_enabled: true @@ -85,4 +85,4 @@ Refer to the official documentation [here](https://github.com/devture/email2matr To enable Email2Matrix, run the [installation](installing.md) command (`--tags=setup-email2matrix,start`). -After installation, you may wish to send a test email to the email address assigned to `mailbox1` (default: `mailbox1@matrix.DOMAIN`) to make sure that Email2Matrix works as expected. +After installation, you may wish to send a test email to the email address assigned to `mailbox1` (default: `mailbox1@matrix.example.com`) to make sure that Email2Matrix works as expected. diff --git a/docs/configuring-playbook-etherpad.md b/docs/configuring-playbook-etherpad.md index 08ec29243..a33976623 100644 --- a/docs/configuring-playbook-etherpad.md +++ b/docs/configuring-playbook-etherpad.md @@ -7,12 +7,12 @@ When enabled together with the Jitsi audio/video conferencing system (see [our d ## Decide on a domain and path -By default, Etherpad is configured to use its own dedicated domain (`etherpad.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Etherpad is configured to use its own dedicated domain (`etherpad.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: ```yaml -# Switch to the domain used for Matrix services (`matrix.DOMAIN`), +# Switch to the domain used for Matrix services (`matrix.example.com`), # so we won't need to add additional DNS records for Etherpad. etherpad_hostname: "{{ matrix_server_fqn_matrix }}" @@ -30,7 +30,7 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ## Adjusting the playbook configuration -[Etherpad](https://etherpad.org) installation is disabled by default. To enable Etherpad, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +[Etherpad](https://etherpad.org) installation is disabled by default. To enable Etherpad, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml etherpad_enabled: true @@ -48,7 +48,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` The Etherpad UI should be available at `https://etherpad.`, while the admin UI (if enabled) should then be available at `https://etherpad./admin`. -If you've [decided on another hostname or path-prefix](#decide-on-a-domain-and-path) (e.g. `https://matrix.DOMAIN/etherpad`), adjust these URLs accordingly before usage. +If you've [decided on another hostname or path-prefix](#decide-on-a-domain-and-path) (e.g. `https://matrix.example.com/etherpad`), adjust these URLs accordingly before usage. ### Managing / Deleting old pads @@ -62,7 +62,7 @@ Then from the plugin manager page (`https://etherpad./admin/plugins This is how it works in Element, it might work quite similar with other clients: -To integrate a standalone Etherpad in a room, create your pad by visiting `https://etherpad.DOMAIN`. When the pad opens, copy the URL and send a command like this to the room: `/addwidget URL`. You will then find your integrated Etherpad within the right sidebar in the `Widgets` section. +To integrate a standalone Etherpad in a room, create your pad by visiting `https://etherpad.example.com`. When the pad opens, copy the URL and send a command like this to the room: `/addwidget URL`. You will then find your integrated Etherpad within the right sidebar in the `Widgets` section. ### Set Dimension default to the self-hosted Etherpad (optional) diff --git a/docs/configuring-playbook-external-postgres.md b/docs/configuring-playbook-external-postgres.md index b8c8f8eb9..e922c8299 100644 --- a/docs/configuring-playbook-external-postgres.md +++ b/docs/configuring-playbook-external-postgres.md @@ -4,7 +4,7 @@ By default, this playbook would set up a PostgreSQL database server on your mach **Note**: using **an external Postgres server is currently [not very seamless](https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1682#issuecomment-1061461683) when it comes to enabling various other playbook services** - you will need to create a new database/credentials for each service and to point each service to its corresponding database using custom `vars.yml` configuration. **For the best experience with the playbook, stick to using the integrated Postgres server**. -If you'd like to use an external Postgres server that you manage, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +If you'd like to use an external Postgres server that you manage, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml postgres_enabled: false diff --git a/docs/configuring-playbook-federation.md b/docs/configuring-playbook-federation.md index 548c55bef..6ebe32bbd 100644 --- a/docs/configuring-playbook-federation.md +++ b/docs/configuring-playbook-federation.md @@ -6,7 +6,7 @@ That is, people on your server can communicate with people on any other Matrix s ## Federating only with select servers -To make your server only federate with servers of your choosing, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +To make your server only federate with servers of your choosing, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_synapse_federation_domain_whitelist: diff --git a/docs/configuring-playbook-jitsi.md b/docs/configuring-playbook-jitsi.md index ce2280914..8d75cd29b 100644 --- a/docs/configuring-playbook-jitsi.md +++ b/docs/configuring-playbook-jitsi.md @@ -9,7 +9,7 @@ The setup done by the playbook is very similar to [docker-jitsi-meet](https://gi ## Prerequisites -Before installing Jitsi, make sure you've created the `jitsi.DOMAIN` DNS record (unless you've changed `jitsi_hostname`, as described below). See [Configuring DNS](configuring-dns.md) for details about DNS changes. +Before installing Jitsi, make sure you've created the `jitsi.example.com` DNS record (unless you've changed `jitsi_hostname`, as described below). See [Configuring DNS](configuring-dns.md) for details about DNS changes. You may also need to open the following ports to your server: @@ -19,7 +19,7 @@ You may also need to open the following ports to your server: ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml jitsi_enabled: true @@ -42,14 +42,14 @@ Currently, there are three supported authentication modes: 'internal' (default), **Note**: Authentication is not tested via the playbook's self-checks. We therefore recommend that you manually verify if authentication is required by jitsi. -For this, try to manually create a conference on jitsi.DOMAIN in your browser. +For this, try to manually create a conference on jitsi.example.com in your browser. ### Authenticate using Jitsi accounts (Auth-Type 'internal') The default authentication mechanism is 'internal' auth, which requires jitsi-accounts to be setup and is the recommended setup, as it also works in federated rooms. With authentication enabled, all meeting rooms have to be opened by a registered user, after which guests are free to join. If a registered host is not yet present, guests are put on hold in individual waiting rooms. -Add these lines to your `inventory/host_vars/matrix.DOMAIN/vars.yml` configuration: +Add these lines to your `inventory/host_vars/matrix.example.com/vars.yml` configuration: ```yaml jitsi_enable_auth: true @@ -89,8 +89,8 @@ An example LDAP configuration could be: ```yaml jitsi_enable_auth: true jitsi_auth_type: ldap -jitsi_ldap_url: "ldap://ldap.DOMAIN" -jitsi_ldap_base: "OU=People,DC=DOMAIN" +jitsi_ldap_url: "ldap://ldap.example.com" +jitsi_ldap_base: "OU=People,DC=example.com" #jitsi_ldap_binddn: "" #jitsi_ldap_bindpw: "" jitsi_ldap_filter: "uid=%u" @@ -115,7 +115,7 @@ The reason is the Jitsi VideoBridge git to LAN client the IP address of the dock Here is how to do it in the playbook. -Add these two lines to your `inventory/host_vars/matrix.DOMAIN/vars.yml` configuration: +Add these two lines to your `inventory/host_vars/matrix.example.com/vars.yml` configuration: ```yaml jitsi_jvb_container_extra_arguments: @@ -124,7 +124,7 @@ jitsi_jvb_container_extra_arguments: ## (Optional) Fine tune Jitsi -Sample **additional** `inventory/host_vars/matrix.DOMAIN/vars.yml` configuration to save up resources (explained below): +Sample **additional** `inventory/host_vars/matrix.example.com/vars.yml` configuration to save up resources (explained below): ```yaml jitsi_web_custom_config_extension: | @@ -283,11 +283,11 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start You can use the self-hosted Jitsi server in multiple ways: -- **by adding a widget to a room via Element** (the one configured by the playbook at `https://element.DOMAIN`). Just start a voice or a video call in a room containing more than 2 members and that would create a Jitsi widget which utilizes your self-hosted Jitsi server. +- **by adding a widget to a room via Element** (the one configured by the playbook at `https://element.example.com`). Just start a voice or a video call in a room containing more than 2 members and that would create a Jitsi widget which utilizes your self-hosted Jitsi server. - **by adding a widget to a room via the Dimension Integration Manager**. You'll have to point the widget to your own Jitsi server manually. See our [Dimension](./configuring-playbook-dimension.md) documentation page for more details. Naturally, Dimension would need to be installed first (the playbook doesn't install it by default). -- **directly (without any Matrix integration)**. Just go to `https://jitsi.DOMAIN` +- **directly (without any Matrix integration)**. Just go to `https://jitsi.example.com` **Note**: Element apps on mobile devices currently [don't support joining meetings on a self-hosted Jitsi server](https://github.com/element-hq/riot-web/blob/601816862f7d84ac47547891bd53effa73d32957/docs/jitsi.md#mobile-app-support). diff --git a/docs/configuring-playbook-ldap-auth.md b/docs/configuring-playbook-ldap-auth.md index cc07f396f..451d386ba 100644 --- a/docs/configuring-playbook-ldap-auth.md +++ b/docs/configuring-playbook-ldap-auth.md @@ -4,7 +4,7 @@ The playbook can install and configure the [matrix-synapse-ldap3](https://github See that project's documentation to learn what it does and why it might be useful to you. -If you decide that you'd like to let this playbook install it for you, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +If you decide that you'd like to let this playbook install it for you, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_synapse_ext_password_provider_ldap_enabled: true diff --git a/docs/configuring-playbook-ma1sd.md b/docs/configuring-playbook-ma1sd.md index c7d163dca..fd65679e1 100644 --- a/docs/configuring-playbook-ma1sd.md +++ b/docs/configuring-playbook-ma1sd.md @@ -12,7 +12,7 @@ This server is private by default, potentially at the expense of user discoverab ## Adjusting the playbook configuration -To enable ma1sd, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable ma1sd, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_ma1sd_enabled: true @@ -53,7 +53,7 @@ To use the [Registration](https://github.com/ma1uta/ma1sd/blob/master/docs/featu - `matrix_ma1sd_configuration_extension_yaml` - to configure ma1sd as required. See the [Registration feature's docs](https://github.com/ma1uta/ma1sd/blob/master/docs/features/registration.md) for inspiration. Also see the [Additional features](#additional-features) section below to learn more about how to use `matrix_ma1sd_configuration_extension_yaml`. -**Note**: For this to work, either the homeserver needs to [federate](configuring-playbook-federation.md) or the `openid` APIs need to exposed on the federation port. When federation is disabled and ma1sd is enabled, we automatically expose the `openid` APIs (only!) on the federation port. Make sure the federation port (usually `https://matrix.DOMAIN:8448`) is whitelisted in your firewall (even if you don't actually use/need federation). +**Note**: For this to work, either the homeserver needs to [federate](configuring-playbook-federation.md) or the `openid` APIs need to exposed on the federation port. When federation is disabled and ma1sd is enabled, we automatically expose the `openid` APIs (only!) on the federation port. Make sure the federation port (usually `https://matrix.example.com:8448`) is whitelisted in your firewall (even if you don't actually use/need federation). ## Authentication @@ -129,7 +129,7 @@ If email address validation emails sent by ma1sd are not reaching you, you shoul If you'd like additional logging information, temporarily enable verbose logging for ma1sd. -Example configuration (`inventory/host_vars/matrix.DOMAIN/vars.yml`): +Example configuration (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_ma1sd_verbose_logging: true diff --git a/docs/configuring-playbook-matrix-corporal.md b/docs/configuring-playbook-matrix-corporal.md index ff762310e..220c6d8ef 100644 --- a/docs/configuring-playbook-matrix-corporal.md +++ b/docs/configuring-playbook-matrix-corporal.md @@ -18,7 +18,7 @@ If you decide that you'd like to let this playbook install it for you, you'd nee ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml # The Shared Secret Auth password provider module is required for Corporal to work. diff --git a/docs/configuring-playbook-matrix-ldap-registration-proxy.md b/docs/configuring-playbook-matrix-ldap-registration-proxy.md index 6ddcc0417..3e1b047be 100644 --- a/docs/configuring-playbook-matrix-ldap-registration-proxy.md +++ b/docs/configuring-playbook-matrix-ldap-registration-proxy.md @@ -9,7 +9,7 @@ implementation of a basic password registration. ## Quickstart -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_ldap_registration_proxy_enabled: true diff --git a/docs/configuring-playbook-matrix-media-repo.md b/docs/configuring-playbook-matrix-media-repo.md index a91f3e444..a935bcbea 100644 --- a/docs/configuring-playbook-matrix-media-repo.md +++ b/docs/configuring-playbook-matrix-media-repo.md @@ -14,7 +14,7 @@ For a simpler alternative (which allows you to offload your media repository sto ## Quickstart -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file and [re-run the installation process](./installing.md) for the playbook: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file and [re-run the installation process](./installing.md) for the playbook: ```yaml matrix_media_repo_enabled: true @@ -105,7 +105,7 @@ If you wish to manually generate the signing key and merge it with your homeserv ### Key backup and revoking -Since your homeserver signing key file is modified by the playbook, a backup will be created in `HOMESERVER_DIR/config/DOMAIN.signing.key.backup`. If you need to remove/revoke old keys, you can restore from this backup or remove the MMR key ID from your `DOMAIN.signing.key` file. +Since your homeserver signing key file is modified by the playbook, a backup will be created in `HOMESERVER_DIR/config/example.com.signing.key.backup`. If you need to remove/revoke old keys, you can restore from this backup or remove the MMR key ID from your `example.com.signing.key` file. Additionally, its recommended after revoking a signing key to update your homeserver config file (`old_signing_keys` field for Synapse and `old_private_keys` for Dendrite). See your homeserver config file for further documentation on how to populate the field. diff --git a/docs/configuring-playbook-matrix-registration.md b/docs/configuring-playbook-matrix-registration.md index 890c23273..cfd0b61c8 100644 --- a/docs/configuring-playbook-matrix-registration.md +++ b/docs/configuring-playbook-matrix-registration.md @@ -14,12 +14,12 @@ Use matrix-registration to **create unique registration links**, which people ca - **an API for creating registration tokens** (unique registration links). This API can be used via `curl` or via the playbook (see [Usage](#usage) below) -- **a user registration page**, where people can use these registration tokens. By default, exposed at `https://matrix.DOMAIN/matrix-registration` +- **a user registration page**, where people can use these registration tokens. By default, exposed at `https://matrix.example.com/matrix-registration` ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_registration_enabled: true @@ -39,7 +39,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ## Usage -**matrix-registration** gets exposed at `https://matrix.DOMAIN/matrix-registration` +**matrix-registration** gets exposed at `https://matrix.example.com/matrix-registration` It provides various [APIs](https://github.com/ZerataX/matrix-registration/wiki/api) - for creating registration tokens, listing tokens, disabling tokens, etc. To make use of all of its capabilities, consider using `curl`. diff --git a/docs/configuring-playbook-mautrix-bridges.md b/docs/configuring-playbook-mautrix-bridges.md index ddb935809..04fda5b01 100644 --- a/docs/configuring-playbook-mautrix-bridges.md +++ b/docs/configuring-playbook-mautrix-bridges.md @@ -7,7 +7,7 @@ You can see each bridge's features at in the `ROADMAP.md` file in its correspond ## Adjusting the playbook configuration -To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the bridge, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml # Replace SERVICENAME with one of: twitter, facebook, instagram, .. @@ -16,7 +16,7 @@ matrix_mautrix_SERVICENAME_enabled: true There are some additional things you may wish to configure about the bridge before you continue. Each bridge may have additional requirements besides `_enabled: true`. For example, the mautrix-telegram bridge (our documentation page about it is [here](configuring-playbook-bridge-mautrix-telegram.md)) requires the `matrix_mautrix_telegram_api_id` and `matrix_mautrix_telegram_api_hash` variables to be defined. Refer to each bridge's individual documentation page for details about enabling bridges. -To **configure a user as an administrator for all bridges**, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To **configure a user as an administrator for all bridges**, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_admin: "@YOUR_USERNAME:{{ matrix_domain }}" @@ -33,7 +33,7 @@ matrix_mautrix_SERVICENAME_configuration_extension_yaml: | ## encryption -Encryption support is off by default. If you would like to enable encryption, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Encryption support is off by default. If you would like to enable encryption, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: **for all bridges with encryption support**: @@ -51,7 +51,7 @@ matrix_mautrix_SERVICENAME_bridge_encryption_default: true ## relay mode -Relay mode is off by default. If you would like to enable relay mode, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Relay mode is off by default. If you would like to enable relay mode, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: **for all bridges with relay mode support**: diff --git a/docs/configuring-playbook-ntfy.md b/docs/configuring-playbook-ntfy.md index 7f5252cc1..17977cf98 100644 --- a/docs/configuring-playbook-ntfy.md +++ b/docs/configuring-playbook-ntfy.md @@ -11,7 +11,7 @@ This role is intended to support UnifiedPush notifications for use with the Matr ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml # Enabling it is the only required setting @@ -56,7 +56,7 @@ You need to install the `ntfy` app on each device on which you want to receive p ### Setting up the `ntfy` Android app 1. Install the [ntfy Android app](https://ntfy.sh/docs/subscribe/phone/) from F-droid or Google Play. -2. In its Settings -> `General: Default server`, enter your ntfy server URL, such as `https://ntfy.DOMAIN`. +2. In its Settings -> `General: Default server`, enter your ntfy server URL, such as `https://ntfy.example.com`. 3. In its Settings -> `Advanced: Connection protocol`, choose `WebSockets`. That is all you need to do in the ntfy app. It has many other features, but for our purposes you can ignore them. In particular you do not need to follow any instructions about subscribing to a notification topic as UnifiedPush will do that automatically. diff --git a/docs/configuring-playbook-own-webserver.md b/docs/configuring-playbook-own-webserver.md index f7d1ab9d8..092128287 100644 --- a/docs/configuring-playbook-own-webserver.md +++ b/docs/configuring-playbook-own-webserver.md @@ -14,7 +14,7 @@ There are 2 ways to use Traefik with this playbook, as described below. ### Traefik managed by the playbook -To have the playbook install and use Traefik, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To have the playbook install and use Traefik, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_playbook_reverse_proxy_type: playbook-managed-traefik @@ -192,7 +192,7 @@ Your reverse-proxy configuration needs to send traffic to these ports. The [`exa It's important that these webservers proxy-pass requests to the correct place and also set the `Host` HTTP header appropriately. If you don't pass the `Host` header correctly, you would get a 404 not found error from Traefik. -To put it another way, `curl http://127.0.0.1:81` would give you a 404, but `curl -H 'Host: matrix.DOMAIN' http://127.0.0.1:81` should work. +To put it another way, `curl http://127.0.0.1:81` would give you a 404, but `curl -H 'Host: matrix.example.com' http://127.0.0.1:81` should work. ### Using no reverse-proxy on the Matrix side at all diff --git a/docs/configuring-playbook-pantalaimon.md b/docs/configuring-playbook-pantalaimon.md index 2663e2e27..4c2ad39ec 100644 --- a/docs/configuring-playbook-pantalaimon.md +++ b/docs/configuring-playbook-pantalaimon.md @@ -8,7 +8,7 @@ This role exposes Pantalaimon's API only within the container network, so bots a ## 1. Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_pantalaimon_enabled: true diff --git a/docs/configuring-playbook-postgres-backup.md b/docs/configuring-playbook-postgres-backup.md index c40e4d0c5..dfb31ba13 100644 --- a/docs/configuring-playbook-postgres-backup.md +++ b/docs/configuring-playbook-postgres-backup.md @@ -7,7 +7,7 @@ For a more complete backup solution (one that includes not only Postgres, but al ## Adjusting the playbook configuration -To enable Postgres backup, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable Postgres backup, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml postgres_backup_enabled: true diff --git a/docs/configuring-playbook-prometheus-grafana.md b/docs/configuring-playbook-prometheus-grafana.md index 6f096da43..c984c86f7 100644 --- a/docs/configuring-playbook-prometheus-grafana.md +++ b/docs/configuring-playbook-prometheus-grafana.md @@ -61,7 +61,7 @@ Most of our docker containers run with limited system access, but the `prometheu When you'd like **to collect metrics from an external Prometheus server**, you need to expose service metrics outside of the container network. -The playbook provides a single endpoint (`https://matrix.DOMAIN/metrics/*`), under which various services may expose their metrics (e.g. `/metrics/node-exporter`, `/metrics/postgres-exporter`, `/metrics/hookshot`, etc). To expose all services on this `/metrics/*` feature, use `matrix_metrics_exposure_enabled`. To protect access using [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication), see `matrix_metrics_exposure_http_basic_auth_enabled` and `matrix_metrics_exposure_http_basic_auth_users` below. +The playbook provides a single endpoint (`https://matrix.example.com/metrics/*`), under which various services may expose their metrics (e.g. `/metrics/node-exporter`, `/metrics/postgres-exporter`, `/metrics/hookshot`, etc). To expose all services on this `/metrics/*` feature, use `matrix_metrics_exposure_enabled`. To protect access using [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication), see `matrix_metrics_exposure_http_basic_auth_enabled` and `matrix_metrics_exposure_http_basic_auth_users` below. When using `matrix_metrics_exposure_enabled`, you don't need to expose metrics for individual services one by one. @@ -69,26 +69,26 @@ The following variables may be of interest: Name | Description -----|---------- -`matrix_metrics_exposure_enabled`|Set this to `true` to **enable metrics exposure for all services** on `https://matrix.DOMAIN/metrics/*`. If you think this is too much, refer to the helpful (but nonexhaustive) list of individual `matrix_SERVICE_metrics_proxying_enabled` (or similar) variables below for exposing metrics on a per-service basis. -`matrix_metrics_exposure_http_basic_auth_enabled`|Set this to `true` to protect all `https://matrix.DOMAIN/metrics/*` endpoints with [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication) (see the other variables below for supplying the actual credentials). When enabled, all endpoints beneath `/metrics` will be protected with the same credentials +`matrix_metrics_exposure_enabled`|Set this to `true` to **enable metrics exposure for all services** on `https://matrix.example.com/metrics/*`. If you think this is too much, refer to the helpful (but nonexhaustive) list of individual `matrix_SERVICE_metrics_proxying_enabled` (or similar) variables below for exposing metrics on a per-service basis. +`matrix_metrics_exposure_http_basic_auth_enabled`|Set this to `true` to protect all `https://matrix.example.com/metrics/*` endpoints with [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication) (see the other variables below for supplying the actual credentials). When enabled, all endpoints beneath `/metrics` will be protected with the same credentials `matrix_metrics_exposure_http_basic_auth_users`|Set this to the Basic Authentication credentials (raw `htpasswd` file content) used to protect `/metrics/*`. This htpasswd-file needs to be generated with the `htpasswd` tool and can include multiple username/password pairs. `matrix_synapse_metrics_enabled`|Set this to `true` to make Synapse expose metrics (locally, on the container network) -`matrix_synapse_metrics_proxying_enabled`|Set this to `true` to expose Synapse's metrics on `https://matrix.DOMAIN/metrics/synapse/main-process` and `https://matrix.DOMAIN/metrics/synapse/worker/TYPE-ID`. Read [below](#collecting-synapse-worker-metrics-to-an-external-prometheus-server) if you're running a Synapse worker setup (`matrix_synapse_workers_enabled: true`). To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. +`matrix_synapse_metrics_proxying_enabled`|Set this to `true` to expose Synapse's metrics on `https://matrix.example.com/metrics/synapse/main-process` and `https://matrix.example.com/metrics/synapse/worker/TYPE-ID`. Read [below](#collecting-synapse-worker-metrics-to-an-external-prometheus-server) if you're running a Synapse worker setup (`matrix_synapse_workers_enabled: true`). To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. `prometheus_node_exporter_enabled`|Set this to `true` to enable the node (general system stats) exporter (locally, on the container network) -`prometheus_node_exporter_container_labels_traefik_enabled`|Set this to `true` to expose the node (general system stats) metrics on `https://matrix.DOMAIN/metrics/node-exporter`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. +`prometheus_node_exporter_container_labels_traefik_enabled`|Set this to `true` to expose the node (general system stats) metrics on `https://matrix.example.com/metrics/node-exporter`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. `prometheus_postgres_exporter_enabled`|Set this to `true` to enable the [Postgres exporter](configuring-playbook-prometheus-postgres.md) (locally, on the container network) -`prometheus_postgres_exporter_container_labels_traefik_enabled`|Set this to `true` to expose the [Postgres exporter](configuring-playbook-prometheus-postgres.md) metrics on `https://matrix.DOMAIN/metrics/postgres-exporter`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. +`prometheus_postgres_exporter_container_labels_traefik_enabled`|Set this to `true` to expose the [Postgres exporter](configuring-playbook-prometheus-postgres.md) metrics on `https://matrix.example.com/metrics/postgres-exporter`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. `matrix_prometheus_nginxlog_exporter_enabled`|Set this to `true` to enable the [NGINX Log exporter](configuring-playbook-prometheus-nginxlog.md) (locally, on the container network) `matrix_sliding_sync_metrics_enabled`|Set this to `true` to make [Sliding Sync](configuring-playbook-sliding-sync-proxy.md) expose metrics (locally, on the container network) -`matrix_sliding_sync_metrics_proxying_enabled`|Set this to `true` to expose the [Sliding Sync](configuring-playbook-sliding-sync-proxy.md) metrics on `https://matrix.DOMAIN/metrics/sliding-sync`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. +`matrix_sliding_sync_metrics_proxying_enabled`|Set this to `true` to expose the [Sliding Sync](configuring-playbook-sliding-sync-proxy.md) metrics on `https://matrix.example.com/metrics/sliding-sync`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. `matrix_bridge_hookshot_metrics_enabled`|Set this to `true` to make [Hookshot](configuring-playbook-bridge-hookshot.md) expose metrics (locally, on the container network) -`matrix_bridge_hookshot_metrics_proxying_enabled`|Set this to `true` to expose the [Hookshot](configuring-playbook-bridge-hookshot.md) metrics on `https://matrix.DOMAIN/metrics/hookshot`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. +`matrix_bridge_hookshot_metrics_proxying_enabled`|Set this to `true` to expose the [Hookshot](configuring-playbook-bridge-hookshot.md) metrics on `https://matrix.example.com/metrics/hookshot`. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above. `matrix_SERVICE_metrics_proxying_enabled`|Various other services/roles may provide similar `_metrics_enabled` and `_metrics_proxying_enabled` variables for exposing their metrics. Refer to each role for details. To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` above or `matrix_SERVICE_container_labels_metrics_middleware_basic_auth_enabled`/`matrix_SERVICE_container_labels_metrics_middleware_basic_auth_users` variables provided by each role. `matrix_media_repo_metrics_enabled`|Set this to `true` to make media-repo expose metrics (locally, on the container network) ### Collecting Synapse worker metrics to an external Prometheus server -If you are using workers (`matrix_synapse_workers_enabled: true`) and have enabled `matrix_synapse_metrics_proxying_enabled` as described above, the playbook will also automatically expose all Synapse worker threads' metrics to `https://matrix.DOMAIN/metrics/synapse/worker/ID`, where `ID` corresponds to the worker `id` as exemplified in `matrix_synapse_workers_enabled_list`. +If you are using workers (`matrix_synapse_workers_enabled: true`) and have enabled `matrix_synapse_metrics_proxying_enabled` as described above, the playbook will also automatically expose all Synapse worker threads' metrics to `https://matrix.example.com/metrics/synapse/worker/ID`, where `ID` corresponds to the worker `id` as exemplified in `matrix_synapse_workers_enabled_list`. The playbook also generates an exemplary config file (`/matrix/synapse/external_prometheus.yml.template`) with all the correct paths which you can copy to your Prometheus server and adapt to your needs. Make sure to edit the specified `password_file` path and contents and path to your `synapse-v2.rules`. It will look a bit like this: @@ -101,7 +101,7 @@ scrape_configs: username: prometheus password_file: /etc/prometheus/password.pwd static_configs: - - targets: ['matrix.DOMAIN:443'] + - targets: ['matrix.example.com:443'] labels: job: "master" index: 1 @@ -112,7 +112,7 @@ scrape_configs: username: prometheus password_file: /etc/prometheus/password.pwd static_configs: - - targets: ['matrix.DOMAIN:443'] + - targets: ['matrix.example.com:443'] labels: job: "generic_worker" index: 18111 diff --git a/docs/configuring-playbook-prometheus-nginxlog.md b/docs/configuring-playbook-prometheus-nginxlog.md index 3923fb685..d7b4ca3bb 100644 --- a/docs/configuring-playbook-prometheus-nginxlog.md +++ b/docs/configuring-playbook-prometheus-nginxlog.md @@ -14,7 +14,7 @@ If your setup includes [Grafana](./configuring-playbook-prometheus-grafana.md), ## Configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_prometheus_nginxlog_exporter_enabled: true @@ -49,6 +49,6 @@ When using an external Prometheus server, you'll need to expose metrics publicly You can either use `matrix_prometheus_nginxlog_exporter_metrics_proxying_enabled: true` to expose just this one service, or `matrix_metrics_exposure_enabled: true` to expose all services. -Whichever way you go with, this service will expose its metrics endpoint **without password-protection** at `https://matrix.DOMAIN/metrics/nginxlog` by default. +Whichever way you go with, this service will expose its metrics endpoint **without password-protection** at `https://matrix.example.com/metrics/nginxlog` by default. For password-protection, use (`matrix_metrics_exposure_http_basic_auth_enabled` and `matrix_metrics_exposure_http_basic_auth_users`) or (`matrix_prometheus_nginxlog_exporter_container_labels_metrics_middleware_basic_auth_enabled` and `matrix_prometheus_nginxlog_exporter_container_labels_metrics_middleware_basic_auth_users`). diff --git a/docs/configuring-playbook-prometheus-postgres.md b/docs/configuring-playbook-prometheus-postgres.md index 51ed9bbd1..f24bc0818 100644 --- a/docs/configuring-playbook-prometheus-postgres.md +++ b/docs/configuring-playbook-prometheus-postgres.md @@ -4,7 +4,7 @@ Expanding on the metrics exposed by the [synapse exporter and the node exporter] ## Adjusting the playbook configuration -To enable the postgres exporter, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable the postgres exporter, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml prometheus_postgres_exporter_enabled: true @@ -21,7 +21,7 @@ Name | Description `prometheus_postgres_exporter_enabled`|Enable the postgres prometheus exporter. This sets up the docker container, connects it to the database and adds a 'job' to the prometheus config which tells prometheus about this new exporter. The default is 'false' `prometheus_postgres_exporter_database_username`| The 'username' for the user that the exporter uses to connect to the database. The default is 'matrix_prometheus_postgres_exporter' `prometheus_postgres_exporter_database_password`| The 'password' for the user that the exporter uses to connect to the database. By default, this is auto-generated by the playbook -`prometheus_postgres_exporter_container_labels_traefik_enabled`|If set to `true`, exposes the Postgres exporter metrics on `https://matrix.DOMAIN/metrics/postgres-exporter` for usage with an [external Prometheus server](configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server). To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` on that other documentation page. +`prometheus_postgres_exporter_container_labels_traefik_enabled`|If set to `true`, exposes the Postgres exporter metrics on `https://matrix.example.com/metrics/postgres-exporter` for usage with an [external Prometheus server](configuring-playbook-prometheus-grafana.md#collecting-metrics-to-an-external-prometheus-server). To password-protect the metrics, see `matrix_metrics_exposure_http_basic_auth_users` on that other documentation page. ## More information diff --git a/docs/configuring-playbook-rageshake.md b/docs/configuring-playbook-rageshake.md index ae33a0817..34fd08633 100644 --- a/docs/configuring-playbook-rageshake.md +++ b/docs/configuring-playbook-rageshake.md @@ -7,12 +7,12 @@ This is useful if you're developing your own applications and would like to coll ## Decide on a domain and path -By default, Rageshake is configured to use its own dedicated domain (`rageshake.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Rageshake is configured to use its own dedicated domain (`rageshake.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: ```yaml -# Switch to the domain used for Matrix services (`matrix.DOMAIN`), +# Switch to the domain used for Matrix services (`matrix.example.com`), # so we won't need to add additional DNS records for Rageshake. matrix_rageshake_hostname: "{{ matrix_server_fqn_matrix }}" @@ -30,7 +30,7 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ## Enabling the Rageshake service -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_rageshake_enabled: true diff --git a/docs/configuring-playbook-rest-auth.md b/docs/configuring-playbook-rest-auth.md index d1dce0e51..c9352c6c6 100644 --- a/docs/configuring-playbook-rest-auth.md +++ b/docs/configuring-playbook-rest-auth.md @@ -6,7 +6,7 @@ See that project's documentation to learn what it does and why it might be usefu ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_synapse_ext_password_provider_rest_auth_enabled: true diff --git a/docs/configuring-playbook-riot-web.md b/docs/configuring-playbook-riot-web.md index 5ce3a7a2b..f2ffb869a 100644 --- a/docs/configuring-playbook-riot-web.md +++ b/docs/configuring-playbook-riot-web.md @@ -12,20 +12,20 @@ Riot has since been [renamed to Element](https://element.io/blog/welcome-to-elem ### Migrating your custom settings -If you have custom `matrix_riot_web_` variables in your `inventory/host_vars/matrix.DOMAIN/vars.yml` file, you'll need to rename them (`matrix_riot_web_` -> `matrix_client_element_`). +If you have custom `matrix_riot_web_` variables in your `inventory/host_vars/matrix.example.com/vars.yml` file, you'll need to rename them (`matrix_riot_web_` -> `matrix_client_element_`). Some other playbook variables (but not all) with `riot` in their name are also renamed. The playbook checks and warns if you are using the old name for some commonly used ones. ### Domain migration -We used to set up Riot at the `riot.DOMAIN` domain. The playbook now sets up Element at `element.DOMAIN` by default. +We used to set up Riot at the `riot.example.com` domain. The playbook now sets up Element at `element.example.com` by default. There are a few options for handling this: -- (**avoiding changes** - using the old `riot.DOMAIN` domain and avoiding DNS changes) -- to keep using `riot.DOMAIN` instead of `element.DOMAIN`, override the domain at which the playbook serves Element: `matrix_server_fqn_element: "riot.{{ matrix_domain }}"` +- (**avoiding changes** - using the old `riot.example.com` domain and avoiding DNS changes) -- to keep using `riot.example.com` instead of `element.example.com`, override the domain at which the playbook serves Element: `matrix_server_fqn_element: "riot.{{ matrix_domain }}"` -- (**embracing changes** - using only `element.DOMAIN`) - set up the `element.DOMAIN` DNS record (see [Configuring DNS](configuring-dns.md)). You can drop the `riot.DOMAIN` in this case. +- (**embracing changes** - using only `element.example.com`) - set up the `element.example.com` DNS record (see [Configuring DNS](configuring-dns.md)). You can drop the `riot.example.com` in this case. ### Re-running the playbook diff --git a/docs/configuring-playbook-s3-goofys.md b/docs/configuring-playbook-s3-goofys.md index 4181cecea..ac32c698c 100644 --- a/docs/configuring-playbook-s3-goofys.md +++ b/docs/configuring-playbook-s3-goofys.md @@ -11,7 +11,7 @@ If you'd like to move your locally-stored media store data to Amazon S3 (or anot ## Adjusting the playbook configuration -After [creating the S3 bucket and configuring it](configuring-playbook-s3.md#bucket-creation-and-security-configuration), add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +After [creating the S3 bucket and configuring it](configuring-playbook-s3.md#bucket-creation-and-security-configuration), add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_s3_media_store_enabled: true diff --git a/docs/configuring-playbook-s3.md b/docs/configuring-playbook-s3.md index 48f44883d..f29f1e3bd 100644 --- a/docs/configuring-playbook-s3.md +++ b/docs/configuring-playbook-s3.md @@ -75,11 +75,11 @@ You [can't easily change which region (US, Europe) your Backblaze account stores After logging in to Backblaze: -- create a new **private** bucket through its user interface (you can call it something like `matrix-DOMAIN-media-store`) +- create a new **private** bucket through its user interface (you can call it something like `matrix-example.com-media-store`) - note the **Endpoint** for your bucket (something like `s3.us-west-002.backblazeb2.com`). - adjust its Lifecycle Rules to: Keep only the last version of the file - go to [App Keys](https://secure.backblaze.com/app_keys.htm) and use the **Add a New Application Key** to create a new one - - restrict it to the previously created bucket (e.g. `matrix-DOMAIN-media-store`) + - restrict it to the previously created bucket (e.g. `matrix-example.com-media-store`) - give it *Read & Write* access The `keyID` value is your **Access Key** and `applicationKey` is your **Secret Key**. diff --git a/docs/configuring-playbook-shared-secret-auth.md b/docs/configuring-playbook-shared-secret-auth.md index 542cd3cee..0c11df290 100644 --- a/docs/configuring-playbook-shared-secret-auth.md +++ b/docs/configuring-playbook-shared-secret-auth.md @@ -6,7 +6,7 @@ See that project's documentation to learn what it does and why it might be usefu ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_ext_password_provider_shared_secret_auth_enabled: true diff --git a/docs/configuring-playbook-sliding-sync-proxy.md b/docs/configuring-playbook-sliding-sync-proxy.md index 4a1dd521e..0368f4a3a 100644 --- a/docs/configuring-playbook-sliding-sync-proxy.md +++ b/docs/configuring-playbook-sliding-sync-proxy.md @@ -14,7 +14,7 @@ Element X Android is [available on the Github Releases page](https://github.com/ ## Decide on a domain and path -By default, the Sliding Sync proxy is configured to be served on the Matrix domain (`matrix.DOMAIN`, controlled by `matrix_server_fqn_matrix`), under the `/sliding-sync` path. +By default, the Sliding Sync proxy is configured to be served on the Matrix domain (`matrix.example.com`, controlled by `matrix_server_fqn_matrix`), under the `/sliding-sync` path. This makes it easy to set it up, **without** having to [adjust your DNS records](#adjusting-dns-records). @@ -28,7 +28,7 @@ If you've changed the default hostname, **you may need to adjust your DNS** reco ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_sliding_sync_enabled: true @@ -56,6 +56,6 @@ matrix_sliding_sync_database_name: 'matrix_sliding_sync' You **don't need to do anything special** to make use of the Sliding Sync Proxy. Simply open your client which supports Sliding Sync (like Element X) and log in. -When the Sliding Sync proxy is [installed](#installing), your `/.well-known/matrix/client` file is also updated. A new `org.matrix.msc3575.proxy` section and `url` property are added there and made to point to your Sliding Sync proxy's base URL (e.g. `https://matrix.DOMAIN/sliding-sync`). +When the Sliding Sync proxy is [installed](#installing), your `/.well-known/matrix/client` file is also updated. A new `org.matrix.msc3575.proxy` section and `url` property are added there and made to point to your Sliding Sync proxy's base URL (e.g. `https://matrix.example.com/sliding-sync`). This allows clients which support Sliding Sync to detect the Sliding Sync Proxy's URL and make use of it. diff --git a/docs/configuring-playbook-ssl-certificates.md b/docs/configuring-playbook-ssl-certificates.md index 0f1b9e509..583bc0b11 100644 --- a/docs/configuring-playbook-ssl-certificates.md +++ b/docs/configuring-playbook-ssl-certificates.md @@ -9,7 +9,7 @@ This guide is about using the integrated Traefik server and doesn't apply if you For testing purposes, you may wish to use staging certificates provide by Let's Encrypt. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml traefik_config_certificatesResolvers_acme_use_staging: true @@ -20,7 +20,7 @@ traefik_config_certificatesResolvers_acme_use_staging: true For testing or other purposes, you may wish to install services without SSL termination and have services exposed to `http://` instead of `https://`. -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml traefik_config_entrypoint_web_secure_enabled: false diff --git a/docs/configuring-playbook-sygnal.md b/docs/configuring-playbook-sygnal.md index 77e2f38a9..d7382c3d0 100644 --- a/docs/configuring-playbook-sygnal.md +++ b/docs/configuring-playbook-sygnal.md @@ -13,12 +13,12 @@ This optional playbook component is only useful to people who develop/build thei ## Decide on a domain and path -By default, Sygnal is configured to use its own dedicated domain (`sygnal.DOMAIN`) and requires you to [adjust your DNS records](#adjusting-dns-records). +By default, Sygnal is configured to use its own dedicated domain (`sygnal.example.com`) and requires you to [adjust your DNS records](#adjusting-dns-records). You can override the domain and path like this: ```yaml -# Switch to the domain used for Matrix services (`matrix.DOMAIN`), +# Switch to the domain used for Matrix services (`matrix.example.com`), # so we won't need to add additional DNS records for Sygnal. matrix_sygnal_hostname: "{{ matrix_server_fqn_matrix }}" @@ -36,7 +36,7 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_sygnal_enabled: true @@ -87,6 +87,6 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ## Usage -To make use of your Sygnal installation, you'd need to build your own Matrix client application, which uses the same API keys (for [GCM/FCM](https://firebase.google.com/docs/cloud-messaging/)) and certificates (for [APNS](https://developer.apple.com/notifications/)) and is to your Sygnal URL endpoint (e.g. `https://sygnal.DOMAIN`). +To make use of your Sygnal installation, you'd need to build your own Matrix client application, which uses the same API keys (for [GCM/FCM](https://firebase.google.com/docs/cloud-messaging/)) and certificates (for [APNS](https://developer.apple.com/notifications/)) and is to your Sygnal URL endpoint (e.g. `https://sygnal.example.com`). Refer to Sygnal's [Notes for application developers](https://github.com/matrix-org/sygnal/blob/master/docs/applications.md) document. diff --git a/docs/configuring-playbook-synapse-admin.md b/docs/configuring-playbook-synapse-admin.md index 1371ea93a..d62423a31 100644 --- a/docs/configuring-playbook-synapse-admin.md +++ b/docs/configuring-playbook-synapse-admin.md @@ -9,7 +9,7 @@ See the project's [documentation](https://github.com/etkecc/synapse-admin) to le ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_admin_enabled: true @@ -30,6 +30,6 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -After installation, Synapse Admin will be accessible at: `https://matrix.DOMAIN/synapse-admin/` +After installation, Synapse Admin will be accessible at: `https://matrix.example.com/synapse-admin/` To use Synapse Admin, you need to have [registered at least one administrator account](registering-users.md) on your server. diff --git a/docs/configuring-playbook-synapse-auto-accept-invite.md b/docs/configuring-playbook-synapse-auto-accept-invite.md index 057d79d70..4aca475a2 100644 --- a/docs/configuring-playbook-synapse-auto-accept-invite.md +++ b/docs/configuring-playbook-synapse-auto-accept-invite.md @@ -10,7 +10,7 @@ In short, it automatically accepts room invites. You can specify that only 1:1 r ## Configuration -If you decide that you'd like to let this playbook install the [synapse-auto-invite-accept](https://github.com/matrix-org/synapse-auto-accept-invite module for you, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +If you decide that you'd like to let this playbook install the [synapse-auto-invite-accept](https://github.com/matrix-org/synapse-auto-accept-invite module for you, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_ext_synapse_auto_accept_invite_enabled: true diff --git a/docs/configuring-playbook-synapse-auto-compressor.md b/docs/configuring-playbook-synapse-auto-compressor.md index 1d22aa535..da279d9e3 100644 --- a/docs/configuring-playbook-synapse-auto-compressor.md +++ b/docs/configuring-playbook-synapse-auto-compressor.md @@ -9,7 +9,7 @@ See the project's [documentation](https://github.com/matrix-org/rust-synapse-com ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_auto_compressor_enabled: true diff --git a/docs/configuring-playbook-synapse-simple-antispam.md b/docs/configuring-playbook-synapse-simple-antispam.md index a5ba1033d..4c13b987a 100644 --- a/docs/configuring-playbook-synapse-simple-antispam.md +++ b/docs/configuring-playbook-synapse-simple-antispam.md @@ -7,7 +7,7 @@ In short, it lets you fight invite-spam by automatically blocking invitiations f ## Adjusting the playbook configuration -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file (adapt to your needs): +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file (adapt to your needs): ```yaml matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled: true diff --git a/docs/configuring-playbook-synapse-usage-exporter.md b/docs/configuring-playbook-synapse-usage-exporter.md index a67becdf4..85c455b0f 100644 --- a/docs/configuring-playbook-synapse-usage-exporter.md +++ b/docs/configuring-playbook-synapse-usage-exporter.md @@ -13,13 +13,13 @@ Enabling this service will automatically: ## Quickstart -Add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file and [re-run the installation process](./installing.md) for the playbook: +Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file and [re-run the installation process](./installing.md) for the playbook: ```yaml matrix_synapse_usage_exporter_enabled: true # (Optional) Expose endpoint if you want to collect statistics from outside (from other homeservers). -# If enabled, synapse-usage-exporter will be exposed publicly at `matrix.DOMAIN/report-usage-stats/push`. +# If enabled, synapse-usage-exporter will be exposed publicly at `matrix.example.com/report-usage-stats/push`. # When collecting usage statistics for Synapse running on the same host, you don't need to enable this. # You can adjust the hostname and path via `matrix_synapse_usage_exporter_hostname` and `matrix_synapse_usage_exporter_path_prefix`. # matrix_synapse_usage_exporter_proxying_enabled: true diff --git a/docs/configuring-playbook-synapse.md b/docs/configuring-playbook-synapse.md index 60f764bc7..f5a08ae5a 100644 --- a/docs/configuring-playbook-synapse.md +++ b/docs/configuring-playbook-synapse.md @@ -21,7 +21,7 @@ Alternatively, **if there is no pre-defined variable** for a Synapse setting you To have Synapse gracefully handle thousands of users, worker support should be enabled. It factors out some homeserver tasks and spreads the load of incoming client and server-to-server traffic between multiple processes. More information can be found in the [official Synapse workers documentation](https://github.com/element-hq/synapse/blob/master/docs/workers.md) and [Tom Foster](https://github.com/tcpipuk)'s [Synapse homeserver guide](https://tcpipuk.github.io/synapse/index.html). -To enable Synapse worker support, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable Synapse worker support, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_workers_enabled: true @@ -126,7 +126,7 @@ If template customization is enabled, the playbook will build a custom container Your custom templates need to live in a public or private git repository. This repository will be cloned during Synapse image customization (during the playbook run). -To enable template customizations, use a configuration (`inventory/host_vars/matrix.DOMAIN/vars.yml`) like this: +To enable template customizations, use a configuration (`inventory/host_vars/matrix.example.com/vars.yml`) like this: ```yaml # If you'd like to ensure that the customized image is built each time the playbook runs, enable this. diff --git a/docs/configuring-playbook-telemetry.md b/docs/configuring-playbook-telemetry.md index 3d2efde68..a4a9117fd 100644 --- a/docs/configuring-playbook-telemetry.md +++ b/docs/configuring-playbook-telemetry.md @@ -9,7 +9,7 @@ growth of the Matrix community, and helps to make Matrix a success. ## Enabling Telemetry -If you'd like to **help by enabling submission of general usage statistics** for your homeserver, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +If you'd like to **help by enabling submission of general usage statistics** for your homeserver, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_synapse_report_stats: true # for synapse diff --git a/docs/configuring-playbook-traefik.md b/docs/configuring-playbook-traefik.md index 3b49a8bb9..aeab79dbf 100644 --- a/docs/configuring-playbook-traefik.md +++ b/docs/configuring-playbook-traefik.md @@ -25,7 +25,7 @@ traefik_config_accessLog_enabled: false ## Enable Traefik Dashboard -This will enable a Traefik [Dashboard](https://doc.traefik.io/traefik/operations/dashboard/) UI at `https://matrix.DOMAIN/dashboard/` (note the trailing `/`). +This will enable a Traefik [Dashboard](https://doc.traefik.io/traefik/operations/dashboard/) UI at `https://matrix.example.com/dashboard/` (note the trailing `/`). ```yaml traefik_dashboard_enabled: true diff --git a/docs/configuring-playbook-turn.md b/docs/configuring-playbook-turn.md index d41ead932..b347c1309 100644 --- a/docs/configuring-playbook-turn.md +++ b/docs/configuring-playbook-turn.md @@ -7,7 +7,7 @@ By default, the Synapse chat server is configured, so that it points to the Cotu ## Disabling Coturn -If, for some reason, you'd like to prevent the playbook from installing Coturn, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +If, for some reason, you'd like to prevent the playbook from installing Coturn, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_coturn_enabled: false diff --git a/docs/configuring-playbook-user-verification-service.md b/docs/configuring-playbook-user-verification-service.md index ccac883a3..62b3ec00b 100644 --- a/docs/configuring-playbook-user-verification-service.md +++ b/docs/configuring-playbook-user-verification-service.md @@ -31,7 +31,7 @@ In order to use UVS, an admin token for the configured homeserver must be suppli ## Enable [Matrix User Verification Service](https://github.com/matrix-org/matrix-user-verification-service) installation is disabled by default. -To enable it, add the following configuration to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file: +To enable it, add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file: ```yaml matrix_user_verification_service_enabled: true diff --git a/docs/faq.md b/docs/faq.md index 50dcdaaf6..24b2f9c35 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -74,9 +74,9 @@ To get started with the playbook, start at the [Prerequisites](prerequisites.md) We have written these automated tasks for you and all you need to do is execute them using the Ansible program. -You can install Ansible and this playbook code repository on your own computer and tell it to install Matrix services at the server living at `matrix.DOMAIN`. We recommend installing Ansible on your own computer. +You can install Ansible and this playbook code repository on your own computer and tell it to install Matrix services at the server living at `matrix.example.com`. We recommend installing Ansible on your own computer. -Alternatively, you can download Ansible and the playbook itself directly on the `matrix.DOMAIN` server. +Alternatively, you can download Ansible and the playbook itself directly on the `matrix.example.com` server. To learn more, see our [dedicated Ansible documentation page](ansible.md). @@ -218,61 +218,61 @@ If your distro runs within an [LXC container](https://linuxcontainers.org/), you ## Configuration -### Why install my server at matrix.DOMAIN and not at the base DOMAIN? +### Why install my server at matrix.example.com and not at the base domain? It's the same with email servers. Your email address is likely `name@company.com`, not `name@mail.company.com`, even though it's `mail.company.com` that is really handling your data for `@company.com` email to work. Using a separate domain name is easier to manage (although it's a little hard to get right at first) and keeps your Matrix server isolated from your website (if you have one), from your email server (if you have one), etc. -We allow `matrix.DOMAIN` to be the Matrix server handling Matrix stuff for `DOMAIN` by [Server Delegation](howto-server-delegation.md). During the installation procedure, we recommend that you set up server delegation using the [.well-known](configuring-well-known.md) method. +We allow `matrix.example.com` to be the Matrix server handling Matrix stuff for `example.com` by [Server Delegation](howto-server-delegation.md). During the installation procedure, we recommend that you set up server delegation using the [.well-known](configuring-well-known.md) method. -If you'd really like to install Matrix services directly on the base domain, see [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain) +If you'd really like to install Matrix services directly on the base domain, see [How do I install on matrix.example.com without involving the base domain?](#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) -### I don't control anything on the base domain and can't set up delegation to matrix.DOMAIN. What do I do? +### I don't control anything on the base domain and can't set up delegation to matrix.example.com. What do I do? -If you're not in control of your base domain (or the server handling it) at all, you can take a look at [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain) +If you're not in control of your base domain (or the server handling it) at all, you can take a look at [How do I install on matrix.example.com without involving the base domain?](#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) ### I can't set up HTTPS on the base domain. How will I get Matrix federating? -If you really can't obtain an HTTPS certificate for your base domain, you can take a look at [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain) +If you really can't obtain an HTTPS certificate for your base domain, you can take a look at [How do I install on matrix.example.com without involving the base domain?](#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) -### How do I install on matrix.DOMAIN without involving the base DOMAIN? +### How do I install on matrix.example.com without involving the base domain? -This Ansible playbook guides you into installing a server for `DOMAIN` (user identifiers are like this: `@user:DOMAIN`), while the server is at `matrix.DOMAIN`. +This Ansible playbook guides you into installing a server for `example.com` (user identifiers are like this: `@user:example.com`), while the server is at `matrix.example.com`. -We allow `matrix.DOMAIN` to be the Matrix server handling Matrix stuff for `DOMAIN` by [Server Delegation](howto-server-delegation.md). During the installation procedure, we recommend that you set up server delegation using the [.well-known](configuring-well-known.md) method. +We allow `matrix.example.com` to be the Matrix server handling Matrix stuff for `example.com` by [Server Delegation](howto-server-delegation.md). During the installation procedure, we recommend that you set up server delegation using the [.well-known](configuring-well-known.md) method. -If you're fine with uglier identifiers (`@user:matrix.DOMAIN`, which is the equivalent of having an email address like `bob@mail.company.com`, instead of just `bob@company.com`), you can do that as well using the following configuration in your `vars.yml` file: +If you're fine with uglier identifiers (`@user:matrix.example.com`, which is the equivalent of having an email address like `bob@mail.company.com`, instead of just `bob@company.com`), you can do that as well using the following configuration in your `vars.yml` file: ```yaml -# This is what your identifiers are like (e.g. `@bob:matrix.YOUR_BASE_DOMAIN`). -matrix_domain: "matrix.YOUR_BASE_DOMAIN" +# This is what your identifiers are like (e.g. `@bob:matrix.example.com`). +matrix_domain: "matrix.example.com" # This is where Matrix services -matrix_server_fqn_matrix: "matrix.YOUR_BASE_DOMAIN" +matrix_server_fqn_matrix: "matrix.example.com" # This is where you access the Element web UI from (if enabled via `matrix_client_element_enabled: true`; enabled by default). # This and the Matrix FQN (see above) are expected to be on the same server. # -# Feel free to use `element.matrix.YOUR_BASE_DOMAIN`, if you'd prefer that. -matrix_server_fqn_element: "element.YOUR_BASE_DOMAIN" +# Feel free to use `element.matrix.example.com`, if you'd prefer that. +matrix_server_fqn_element: "element.example.com" # This is where you access Dimension (if enabled via `matrix_dimension_enabled: true`; NOT enabled by default). # -# Feel free to use `dimension.matrix.YOUR_BASE_DOMAIN`, if you'd prefer that. -matrix_server_fqn_dimension: "dimension.YOUR_BASE_DOMAIN" +# Feel free to use `dimension.matrix.example.com`, if you'd prefer that. +matrix_server_fqn_dimension: "dimension.example.com" # This is where you access Jitsi (if enabled via `jitsi_enabled: true`; NOT enabled by default). # -# Feel free to use `jitsi.matrix.YOUR_BASE_DOMAIN`, if you'd prefer that. -matrix_server_fqn_jitsi: "jitsi.YOUR_BASE_DOMAIN" +# Feel free to use `jitsi.matrix.example.com`, if you'd prefer that. +matrix_server_fqn_jitsi: "jitsi.example.com" ``` ### I don't use the base domain for anything. How am I supposed to set up Server Delegation for Matrix services? If you don't use your base domain for anything, then it's hard for you to "serve files over HTTPS" on it -- something we ask you to do for the [.well-known](configuring-well-known.md) setup (needed for [Server Delegation](howto-server-delegation.md)). -Luckily, the playbook can set up your Matrix server (at `matrix.DOMAIN`) to also handle traffic for the base domain (`DOMAIN`). +Luckily, the playbook can set up your Matrix server (at `matrix.example.com`) to also handle traffic for the base domain (`example.com`). See [Serving the base domain](configuring-playbook-base-domain-serving.md). @@ -332,7 +332,7 @@ Configuration variables are defined in multiple places in this playbook and are - then, there are overrides in `group_vars/matrix_servers`, which aim to adjust these "standalone role defaults" to something which better fits the playbook in its entirety. -- finally, there's your `inventory/host_vars/matrix.DOMAIN/vars.yml` file, which is the ultimate override +- finally, there's your `inventory/host_vars/matrix.example.com/vars.yml` file, which is the ultimate override ### What configuration variables are available? @@ -340,7 +340,7 @@ You can discover the variables you can override in each role (`roles/*/*/default As described in [How is the effective configuration determined?](#how-is-the-effective-configuration-determined), these role-defaults may be overriden by values defined in `group_vars/matrix_servers`. -Refer to both of these for inspiration. Still, as mentioned in [Configuring the playbook](configuring-playbook.md), you're only ever supposed to edit your own `inventory/host_vars/matrix.DOMAIN/vars.yml` file and nothing else inside the playbook (unless you're meaning to contribute new features). +Refer to both of these for inspiration. Still, as mentioned in [Configuring the playbook](configuring-playbook.md), you're only ever supposed to edit your own `inventory/host_vars/matrix.example.com/vars.yml` file and nothing else inside the playbook (unless you're meaning to contribute new features). **Note**: some of the roles (`roles/galaxy/*`) live in separate repositories and are only installed after your run `just roles` (or `make roles`) or `just update` (which automatically does `git pull` and `just roles`). @@ -373,7 +373,7 @@ Yes, you can. You generally need to do a playbook installation (start at the [Prerequisites](prerequisites.md) page), followed by importing your existing data into it. -This Ansible playbook guides you into installing a server for `DOMAIN` (user identifiers are like this: `@user:DOMAIN`), while the server is at `matrix.DOMAIN`. If your existing setup has a server name (`server_name` configuration setting in Synapse's `homeserver.yaml` file) other than the base `DOMAIN`, you may need to tweak some additional variables. This FAQ entry may be of use if you're dealing with a more complicated setup - [How do I install on matrix.DOMAIN without involving the base DOMAIN?](#how-do-i-install-on-matrixdomain-without-involving-the-base-domain) +This Ansible playbook guides you into installing a server for `example.com` (user identifiers are like this: `@user:example.com`), while the server is at `matrix.example.com`. If your existing setup has a server name (`server_name` configuration setting in Synapse's `homeserver.yaml` file) other than the base `example.com`, you may need to tweak some additional variables. This FAQ entry may be of use if you're dealing with a more complicated setup - [How do I install on matrix.example.com without involving the base domain?](#how-do-i-install-on-matrix-example-com-without-involving-the-base-domain) After configuring the playbook and installing and **before starting** services (done with `ansible-playbook ... --tags=start`) you'd import [your SQLite](importing-synapse-sqlite.md) (or [Postgres](importing-postgres.md)) database and also [import your media store](importing-synapse-media-store.md). diff --git a/docs/maintenance-and-troubleshooting.md b/docs/maintenance-and-troubleshooting.md index aea32cd8e..b6262a63a 100644 --- a/docs/maintenance-and-troubleshooting.md +++ b/docs/maintenance-and-troubleshooting.md @@ -28,7 +28,7 @@ Because the [Synapse](https://github.com/element-hq/synapse) Matrix server is or If you'd like to debug an issue or [report a Synapse bug](https://github.com/matrix-org/synapse/issues/new/choose) to the developers, it'd be better if you temporarily increasing the logging level to `INFO`. -Example configuration (`inventory/host_vars/matrix.DOMAIN/vars.yml`): +Example configuration (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_synapse_log_level: "INFO" diff --git a/docs/maintenance-migrating.md b/docs/maintenance-migrating.md index 638b3c0cb..d71a13e3d 100644 --- a/docs/maintenance-migrating.md +++ b/docs/maintenance-migrating.md @@ -4,7 +4,7 @@ # Migrating to new server -1. Prepare by lowering DNS TTL for your domains (`matrix.DOMAIN`, etc.), so that DNS record changes (step 4 below) would happen faster, leading to less downtime +1. Prepare by lowering DNS TTL for your domains (`matrix.example.com`, etc.), so that DNS record changes (step 4 below) would happen faster, leading to less downtime 2. Stop all services on the old server and make sure they won't be starting again. Execute this on the old server: `systemctl disable --now matrix*` (you might have to cd to /etc/systemd/system/ first) 3. Copy directory `/matrix` from the old server to the new server. Make sure to preserve ownership and permissions (use `cp -p` or `rsync -ar`)! 4. Make sure your DNS records are adjusted to point to the new server's IP address diff --git a/docs/maintenance-synapse.md b/docs/maintenance-synapse.md index f89594a45..b81f91937 100644 --- a/docs/maintenance-synapse.md +++ b/docs/maintenance-synapse.md @@ -55,7 +55,7 @@ First, set up an SSH tunnel to your matrix server (skip if it is your local mach ``` # you may replace 1799 with an arbitrary port unbound on both machines -ssh -L 1799:localhost:1799 matrix.DOMAIN +ssh -L 1799:localhost:1799 matrix.example.com ``` Then start up an ephemeral [adminer](https://www.adminer.org/) container on the Matrix server, connecting it to the `matrix` network and linking the postgresql container: diff --git a/docs/obtaining-access-tokens.md b/docs/obtaining-access-tokens.md index 7db2ef1bf..913f1b90c 100644 --- a/docs/obtaining-access-tokens.md +++ b/docs/obtaining-access-tokens.md @@ -31,9 +31,9 @@ curl -XPOST -d '{ "password": "PASSWORD", "type": "m.login.password", "device_id": "YOURDEVICEID" -}' 'https://matrix.YOURDOMAIN/_matrix/client/r0/login' +}' 'https://matrix.example.com/_matrix/client/r0/login' ``` -Change `USERNAME`, `PASSWORD`, and `YOURDOMAIN` accordingly. +Change `USERNAME`, `PASSWORD`, and `example.com` accordingly. `YOURDEVICEID` is optional and can be used to more easily identify the session later. When omitted (mind the commas in the JSON payload if you'll be omitting it), a random device ID will be generated. @@ -41,9 +41,9 @@ Your response will look like this (prettified): ``` { - "user_id":"@USERNAME:YOURDOMAIN", + "user_id":"@USERNAME:example.com", "access_token":">>>YOUR_ACCESS_TOKEN_IS_HERE<<<", - "home_server":"YOURDOMAIN", + "home_server":"example.com", "device_id":"YOURDEVICEID" } ``` diff --git a/docs/registering-users.md b/docs/registering-users.md index 1fddafbbd..b6cd32852 100644 --- a/docs/registering-users.md +++ b/docs/registering-users.md @@ -71,13 +71,13 @@ If you're opening up registrations publicly like this, you might also wish to [c To change the admin privileges for a user, you need to run an SQL query like this against the `synapse` database: ```sql -UPDATE users SET admin=ADMIN_VALUE WHERE name = '@USER:DOMAIN'; +UPDATE users SET admin=ADMIN_VALUE WHERE name = '@USER:example.com'; ``` where: - `ADMIN_VALUE` being either `0` (regular user) or `1` (admin) -- `USER` and `DOMAIN` pointing to a valid user on your server +- `USER` and `example.com` pointing to a valid user on your server If you're using the integrated Postgres server and not an [external Postgres server](configuring-playbook-external-postgres.md), you can launch a Postgres into the `synapse` database by: diff --git a/examples/reverse-proxies/apache/README.md b/examples/reverse-proxies/apache/README.md index a25ba2017..939df3f22 100644 --- a/examples/reverse-proxies/apache/README.md +++ b/examples/reverse-proxies/apache/README.md @@ -10,5 +10,5 @@ To get started, first follow the [front the integrated reverse-proxy webserver w `matrix-domain.conf` contains configuration for the Matrix domain, which handles both the Client-Server API (port `443`) and the Matrix Federation API (port `8448`). -`matrix-client-element.conf` is an example for when you're hosting Element at `element.DOMAIN`. -This configuration can also be used as an example for handling other domains, depending on the services you enable with the playbook (e.g. `dimension.DOMAIN`, etc). +`matrix-client-element.conf` is an example for when you're hosting Element at `element.example.com`. +This configuration can also be used as an example for handling other domains, depending on the services you enable with the playbook (e.g. `dimension.example.com`, etc). diff --git a/examples/reverse-proxies/apache/matrix-client-element.conf b/examples/reverse-proxies/apache/matrix-client-element.conf index 005a9fc28..6ae104ea4 100644 --- a/examples/reverse-proxies/apache/matrix-client-element.conf +++ b/examples/reverse-proxies/apache/matrix-client-element.conf @@ -1,23 +1,23 @@ -# This is a sample file demonstrating how to set up reverse-proxy for element.DOMAIN. +# This is a sample file demonstrating how to set up reverse-proxy for element.example.com. # If you're not using Element (`matrix_client_element_enabled: false`), you won't need this. - ServerName element.DOMAIN + ServerName element.example.com # You may wish to handle the /.well-known/acme-challenge paths here somehow, # if you're using ACME (Let's Encrypt) certificates. - Redirect permanent / https://element.DOMAIN/ + Redirect permanent / https://element.example.com/ - ServerName element.DOMAIN + ServerName element.example.com SSLEngine On # If you manage SSL certificates by yourself, these paths will differ. - SSLCertificateFile /matrix/ssl/config/live/element.DOMAIN/fullchain.pem - SSLCertificateKeyFile /matrix/ssl/config/live/element.DOMAIN/privkey.pem + SSLCertificateFile /matrix/ssl/config/live/element.example.com/fullchain.pem + SSLCertificateKeyFile /matrix/ssl/config/live/element.example.com/privkey.pem SSLProxyEngine on SSLProxyProtocol +TLSv1.2 +TLSv1.3 @@ -30,6 +30,6 @@ ProxyPass / http://127.0.0.1:81/ ProxyPassReverse / http://127.0.0.1:81/ - ErrorLog ${APACHE_LOG_DIR}/element.DOMAIN-error.log - CustomLog ${APACHE_LOG_DIR}/element.DOMAIN-access.log combined + ErrorLog ${APACHE_LOG_DIR}/element.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/element.example.com-access.log combined diff --git a/examples/reverse-proxies/apache/matrix-domain.conf b/examples/reverse-proxies/apache/matrix-domain.conf index 4c79558b2..18aaabd25 100644 --- a/examples/reverse-proxies/apache/matrix-domain.conf +++ b/examples/reverse-proxies/apache/matrix-domain.conf @@ -1,23 +1,23 @@ -# This is a sample file demonstrating how to set up reverse-proxy for matrix.DOMAIN +# This is a sample file demonstrating how to set up reverse-proxy for matrix.example.com - ServerName matrix.DOMAIN + ServerName matrix.example.com # You may wish to handle the /.well-known/acme-challenge paths here somehow, # if you're using ACME (Let's Encrypt) certificates. - Redirect permanent / https://matrix.DOMAIN/ + Redirect permanent / https://matrix.example.com/ # Client-Server API - ServerName matrix.DOMAIN + ServerName matrix.example.com SSLEngine On # If you manage SSL certificates by yourself, these paths will differ. - SSLCertificateFile /path/to/matrix.DOMAIN/fullchain.pem - SSLCertificateKeyFile /path/to/matrix.DOMAIN/privkey.pem + SSLCertificateFile /path/to/matrix.example.com/fullchain.pem + SSLCertificateKeyFile /path/to/matrix.example.com/privkey.pem SSLProxyEngine on SSLProxyProtocol +TLSv1.2 +TLSv1.3 @@ -32,20 +32,20 @@ ProxyPass / http://127.0.0.1:81/ retry=0 nocanon ProxyPassReverse / http://127.0.0.1:81/ - ErrorLog ${APACHE_LOG_DIR}/matrix.DOMAIN-error.log - CustomLog ${APACHE_LOG_DIR}/matrix.DOMAIN-access.log combined + ErrorLog ${APACHE_LOG_DIR}/matrix.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/matrix.example.com-access.log combined # Server-Server (federation) API Listen 8448 - ServerName matrix.DOMAIN + ServerName matrix.example.com SSLEngine On # If you manage SSL certificates by yourself, these paths will differ. - SSLCertificateFile /matrix/ssl/config/live/matrix.DOMAIN/fullchain.pem - SSLCertificateKeyFile /matrix/ssl/config/live/matrix.DOMAIN/privkey.pem + SSLCertificateFile /matrix/ssl/config/live/matrix.example.com/fullchain.pem + SSLCertificateKeyFile /matrix/ssl/config/live/matrix.example.com/privkey.pem SSLProxyEngine on SSLProxyProtocol +TLSv1.2 +TLSv1.3 @@ -60,6 +60,6 @@ Listen 8448 ProxyPass / http://127.0.0.1:8449/ retry=0 nocanon ProxyPassReverse / http://127.0.0.1:8449/ - ErrorLog ${APACHE_LOG_DIR}/matrix.DOMAIN-error.log - CustomLog ${APACHE_LOG_DIR}/matrix.DOMAIN-access.log combined + ErrorLog ${APACHE_LOG_DIR}/matrix.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/matrix.example.com-access.log combined diff --git a/examples/reverse-proxies/nginx-proxy-manager/README.md b/examples/reverse-proxies/nginx-proxy-manager/README.md index b4bce8846..aa7a7b53e 100644 --- a/examples/reverse-proxies/nginx-proxy-manager/README.md +++ b/examples/reverse-proxies/nginx-proxy-manager/README.md @@ -21,14 +21,14 @@ Open the 'Proxy Hosts' page in the NPM web interface and select `Add Proxy Host` ```md # Details # Matrix web proxy config -Domain Names: matrix.DOMAIN +Domain Names: matrix.example.com Scheme: http Forward Hostname/IP: IP-ADDRESS-OF-YOUR-MATRIX Forward Port: 81 # SSL # Either 'Request a new certificate' or select an existing one -SSL Certificate: matrix.DOMAIN or *.DOMAIN +SSL Certificate: matrix.example.com or *.example.com Force SSL: true HTTP/2 Support: true @@ -42,14 +42,14 @@ Again, under the 'Proxy Hosts' page select `Add Proxy Host`, this time for your ```md # Details # Matrix Federation proxy config -Domain Names: matrix.DOMAIN:8448 +Domain Names: matrix.example.com:8448 Scheme: http Forward Hostname/IP: IP-ADDRESS-OF-YOUR-MATRIX Forward Port: 8449 # SSL # Either 'Request a new certificate' or select an existing one -SSL Certificate: matrix.DOMAIN or *.DOMAIN +SSL Certificate: matrix.example.com or *.example.com Force SSL: true HTTP/2 Support: true @@ -60,4 +60,4 @@ Custom Nginx Configuration: client_max_body_size 50M; ``` -Also note, NPM would need to be configured for whatever other services you are using. For example, you would need to create additional proxy hosts for `element.DOMAIN` or `jitsi.DOMAIN`, which would use the forwarding port `81`. +Also note, NPM would need to be configured for whatever other services you are using. For example, you would need to create additional proxy hosts for `element.example.com` or `jitsi.example.com`, which would use the forwarding port `81`. diff --git a/examples/reverse-proxies/nginx/README.md b/examples/reverse-proxies/nginx/README.md index be52550e5..b57d4557d 100644 --- a/examples/reverse-proxies/nginx/README.md +++ b/examples/reverse-proxies/nginx/README.md @@ -12,6 +12,6 @@ To get started, first follow the [front the integrated reverse-proxy webserver w Copy the [matrix.conf](matrix.conf) file to your nginx server's filesystem, modify it to your needs and include it in your nginx configuration (e.g. `include /path/to/matrix.conf;`). -This configuration **disables SSL certificate retrieval**, so you will **need to obtain SSL certificates manually** (e.g. by using [certbot](https://certbot.eff.org/)) and set the appropriate path in `matrix.conf`. In the example nginx configuration, a single certificate is used for all subdomains (`matrix.DOMAIN`, `element.DOMAIN`, etc.). For your setup, may wish to change this and use separate `server` blocks and separate certificate files for each host. +This configuration **disables SSL certificate retrieval**, so you will **need to obtain SSL certificates manually** (e.g. by using [certbot](https://certbot.eff.org/)) and set the appropriate path in `matrix.conf`. In the example nginx configuration, a single certificate is used for all subdomains (`matrix.example.com`, `element.example.com`, etc.). For your setup, may wish to change this and use separate `server` blocks and separate certificate files for each host. Also note that your copy of the `matrix.conf` file has to be adapted to whatever services you are using. For example, remove `element.example.com` from the `server_name` list if you don't use [Element](../../../docs/configuring-playbook-client-element.md) web client or add `dimension.example.com` to it if you do use the [Dimension](../../../docs/configuring-playbook-dimension.md) integration manager. diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 0fbda0089..e0f7f907b 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -258,7 +258,7 @@ matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_s # - Coturn gets a higher level if `devture_systemd_service_manager_service_restart_mode == 'one-by-one'` to intentionally delay it, because: # - starting services one by one means that the service manager role waits for each service to fully start before proceeding to the next one # - if Coturn has a lower priority than the homeserver, it would be started before it -# - since Coturn is started before the homeserver, there's no container label telling Traefik to get a `matrix.DOMAIN` certificate +# - since Coturn is started before the homeserver, there's no container label telling Traefik to get a `matrix.example.com` certificate # - thus, Coturn would spin and wait for a certificate until it fails. We'd get a playbook failure due to it, but service manager will proceed to start all other services anyway. # - only later, when the homeserver actually starts, would that certificate be fetched and dumped # - reverse-proxying services get level 3000 diff --git a/roles/custom/matrix-alertmanager-receiver/defaults/main.yml b/roles/custom/matrix-alertmanager-receiver/defaults/main.yml index ee23b09b7..adc43220a 100644 --- a/roles/custom/matrix-alertmanager-receiver/defaults/main.yml +++ b/roles/custom/matrix-alertmanager-receiver/defaults/main.yml @@ -41,7 +41,7 @@ matrix_alertmanager_receiver_container_additional_networks_default: [] matrix_alertmanager_receiver_container_additional_networks_auto: [] matrix_alertmanager_receiver_container_additional_networks_custom: [] -# Controls whether matrix-alertmanager-receiver metrics should be proxied (exposed) on `matrix.DOMAIN/metrics/matrix-alertmanager-receiver` +# Controls whether matrix-alertmanager-receiver metrics should be proxied (exposed) on `matrix.example.com/metrics/matrix-alertmanager-receiver` matrix_alertmanager_receiver_metrics_proxying_enabled: false matrix_alertmanager_receiver_metrics_proxying_hostname: '' matrix_alertmanager_receiver_metrics_proxying_path: /metrics/matrix-alertmanager-receiver diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 5dce05582..9cc9850cd 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -289,7 +289,7 @@ matrix_playbook_public_matrix_federation_api_traefik_entrypoint_definition: # may wish to register their routes with this additional entrypoint and provide their services on it for internal (no-public-network and non-TLS) use. # # This entrypoint provides local addons (e.g. bridges, bots, etc.) with the ability to easily & quickly communicate with the homeserver and/or related software. -# Such services can reach the homeserver over the public internet (e.g. https://matrix.DOMAIN), but this is slow due to networking and SSL-termination. +# Such services can reach the homeserver over the public internet (e.g. https://matrix.example.com), but this is slow due to networking and SSL-termination. # Talking directly to the homeserver (e.g. `http://matrix-synapse:8008`) is another option, but does not allow other homeserver-related software # (e.g. identity servers like ma1sd, media repository servers like matrix-media-repo, firewalls like matrix-corporal) # to register itself for certain homeserver routes. diff --git a/roles/custom/matrix-base/tasks/validate_config.yml b/roles/custom/matrix-base/tasks/validate_config.yml index 3ca6061b4..fd389cd1c 100644 --- a/roles/custom/matrix-base/tasks/validate_config.yml +++ b/roles/custom/matrix-base/tasks/validate_config.yml @@ -30,7 +30,7 @@ If you're observing this error on a new installation, you should ensure that the `matrix_homeserver_generic_secret_key` is defined. If you think you've defined it, but are still getting this error, then it's likely that you have a typo - in your domain name in `inventory/hosts` or in one of the directories leading up to your `inventory/host_vars/matrix.DOMAIN/vars.yml` file. + in your domain name in `inventory/hosts` or in one of the directories leading up to your `inventory/host_vars/matrix.example.com/vars.yml` file. If you're observing this error on an existing homeserver installation, you can fix it easily and in a backward-compatible way by adding `{% raw %}matrix_homeserver_generic_secret_key: "{{ matrix_synapse_macaroon_secret_key }}"{% endraw %}` diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index 8d1bc733c..aab8a5d90 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -57,7 +57,7 @@ matrix_bot_chatgpt_keyv_bot_storage: true # Matrix Static Settings (required, see notes) # Defaults to "https://matrix.org" matrix_bot_chatgpt_matrix_homeserver_url: "" # MATRIX_HOMESERVER_URL= -# With the @ and :DOMAIN, ie @SOMETHING:DOMAIN, needs to be set, created manually beforehand. +# With the @ and :example.com, ie @SOMETHING:example.com, needs to be set, created manually beforehand. matrix_bot_chatgpt_matrix_bot_username_localpart: 'bot.chatgpt' matrix_bot_chatgpt_matrix_bot_username: "@{{ matrix_bot_chatgpt_matrix_bot_username_localpart }}:{{ matrix_domain }}" # MATRIX_BOT_USERNAME= # Set `MATRIX_BOT_PASSWORD` the bot will print an `MATRIX_ACCESS_TOKEN` to the terminal diff --git a/roles/custom/matrix-bot-chatgpt/templates/env.j2 b/roles/custom/matrix-bot-chatgpt/templates/env.j2 index d9ca2d50c..a6f62cc67 100644 --- a/roles/custom/matrix-bot-chatgpt/templates/env.j2 +++ b/roles/custom/matrix-bot-chatgpt/templates/env.j2 @@ -10,7 +10,7 @@ KEYV_URL={{ matrix_bot_chatgpt_keyv_url }} KEYV_BOT_ENCRYPTION={{ matrix_bot_chatgpt_keyv_bot_encryption|lower }} KEYV_BOT_STORAGE={{ matrix_bot_chatgpt_keyv_bot_storage|lower }} -# With the @ and :DOMAIN, ie @SOMETHING:DOMAIN +# With the @ and :example.com, ie @SOMETHING:example.com MATRIX_BOT_USERNAME={{ matrix_bot_chatgpt_matrix_bot_username }} MATRIX_BOT_PASSWORD={{ matrix_bot_chatgpt_matrix_bot_password }} diff --git a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml index 9a0f38353..33871b77b 100644 --- a/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml @@ -102,7 +102,7 @@ ansible.builtin.fail: msg: >- Your configuration contains a variable (`{{ item }}`), which refers to the old metrics collection system for Hookshot, - which exposed metrics on `https://stats.DOMAIN/hookshot/metrics`. + which exposed metrics on `https://stats.example.com/hookshot/metrics`. We now recommend exposing Hookshot metrics in another way, from another URL. Refer to the changelog for more details: https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/CHANGELOG.md#2022-06-22 diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index 33d16a94a..327e8b0ab 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -114,10 +114,10 @@ matrix_mautrix_meta_instagram_appservice_address: "http://{{ matrix_mautrix_meta matrix_mautrix_meta_instagram_appservice_id: "{{ matrix_mautrix_meta_instagram_meta_mode }}" -# For Facebook/Messenger, we use the same `@messengerbot:DOMAIN` username regardless of how bridging happens for multiple reasons: +# For Facebook/Messenger, we use the same `@messengerbot:example.com` username regardless of how bridging happens for multiple reasons: # - it's consistent - regardless of how bridging happens, the bridged service is actually Messenger -# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:DOMAIN` -# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:DOMAIN` +# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:example.com` +# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:example.com` # - `matrix_mautrix_meta_instagram_appservice_avatar` only has icons for Messenger and Instagram, not Facebook matrix_mautrix_meta_instagram_appservice_username_prefix: |- {{ diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index 7c99f5d33..9b561f2df 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -114,10 +114,10 @@ matrix_mautrix_meta_messenger_appservice_address: "http://{{ matrix_mautrix_meta matrix_mautrix_meta_messenger_appservice_id: "{{ matrix_mautrix_meta_messenger_meta_mode }}" -# For Facebook/Messenger, we use the same `@messengerbot:DOMAIN` username regardless of how bridging happens for multiple reasons: +# For Facebook/Messenger, we use the same `@messengerbot:example.com` username regardless of how bridging happens for multiple reasons: # - it's consistent - regardless of how bridging happens, the bridged service is actually Messenger -# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:DOMAIN` -# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:DOMAIN` +# - it's easy for users - you may change the mode, but the bot is always at `@messengerbot:example.com` +# - it doesn't conflict with mautrix-facebook which uses `@facebookbot:example.com` # - `matrix_mautrix_meta_messenger_appservice_avatar` only has icons for Messenger and Instagram, not Facebook matrix_mautrix_meta_messenger_appservice_username_prefix: |- {{ diff --git a/roles/custom/matrix-media-repo/defaults/main.yml b/roles/custom/matrix-media-repo/defaults/main.yml index 7f1ce62c4..aef4eb04b 100755 --- a/roles/custom/matrix-media-repo/defaults/main.yml +++ b/roles/custom/matrix-media-repo/defaults/main.yml @@ -44,7 +44,7 @@ matrix_media_repo_container_network: "{{ matrix_media_repo_identifier }}" # Use this to expose this container to another reverse proxy, which runs in a different container network. matrix_media_repo_container_additional_networks: [] -# Controls whether media repo metrics should be proxied (exposed) on `matrix.DOMAIN/metrics/matrix-media-repo` +# Controls whether media repo metrics should be proxied (exposed) on `matrix.example.com/metrics/matrix-media-repo` matrix_media_repo_metrics_proxying_enabled: false matrix_media_repo_metrics_proxying_hostname: "" matrix_media_repo_metrics_proxying_path: "/metrics/matrix-media-repo" diff --git a/roles/custom/matrix-registration/defaults/main.yml b/roles/custom/matrix-registration/defaults/main.yml index f2b87d942..008b9b75c 100644 --- a/roles/custom/matrix-registration/defaults/main.yml +++ b/roles/custom/matrix-registration/defaults/main.yml @@ -114,7 +114,7 @@ matrix_registration_api_token_endpoint: "{{ matrix_registration_scheme }}://{{ m matrix_registration_api_validate_certs: true -# The URL to your homeserver (e.g.: `https://matrix.DOMAIN`). +# The URL to your homeserver (e.g.: `https://matrix.example.com`). # A local (in-container address) is preferable. matrix_registration_server_location: "" diff --git a/roles/custom/matrix-sliding-sync/defaults/main.yml b/roles/custom/matrix-sliding-sync/defaults/main.yml index 65f51be4c..81e5a44a2 100644 --- a/roles/custom/matrix-sliding-sync/defaults/main.yml +++ b/roles/custom/matrix-sliding-sync/defaults/main.yml @@ -43,7 +43,7 @@ matrix_sliding_sync_container_additional_networks: [] matrix_sliding_sync_metrics_enabled: false matrix_sliding_sync_metrics_port: 2112 -# Controls whether Sliding Sync metrics should be proxied (exposed) on `matrix.DOMAIN/metrics/sliding-sync` +# Controls whether Sliding Sync metrics should be proxied (exposed) on `matrix.example.com/metrics/sliding-sync` matrix_sliding_sync_metrics_proxying_enabled: false matrix_sliding_sync_metrics_proxying_hostname: '' matrix_sliding_sync_metrics_proxying_path: /metrics/sliding-sync diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index 51a996dc0..09e9d4215 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -386,6 +386,6 @@ matrix_static_files_self_check_well_known_matrix_client_follow_redirects: none # TODO - review this one # Specifies where requests for the root URI (`/`) on the `matrix.` domain should be redirected. # If this has an empty value, they're just passed to the homeserver, which serves a static page. -# If you'd like to make `https://matrix.DOMAIN` redirect to `https://element.DOMAIN` (or something of that sort), specify the domain name here. -# Example value: `element.DOMAIN` (or `{{ matrix_server_fqn_element }}`). +# If you'd like to make `https://matrix.example.com` redirect to `https://element.example.com` (or something of that sort), specify the domain name here. +# Example value: `element.example.com` (or `{{ matrix_server_fqn_element }}`). matrix_static_files_client_redirect_root_uri_to_domain: "" diff --git a/roles/custom/matrix-synapse-usage-exporter/defaults/main.yml b/roles/custom/matrix-synapse-usage-exporter/defaults/main.yml index c207e4b1c..71f7b7423 100644 --- a/roles/custom/matrix-synapse-usage-exporter/defaults/main.yml +++ b/roles/custom/matrix-synapse-usage-exporter/defaults/main.yml @@ -51,7 +51,7 @@ matrix_synapse_usage_exporter_container_extra_arguments: [] # Controls whether the synapse-usage-exporter's web services should be proxied (exposed publicly). # -# Exposure happens on `matrix.DOMAIN/report-usage-stats/push` by default. +# Exposure happens on `matrix.example.com/report-usage-stats/push` by default. # See: `matrix_synapse_usage_exporter_hostname` and `matrix_synapse_usage_exporter_path_prefix`. matrix_synapse_usage_exporter_proxying_enabled: false diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index c7489fa50..e9cf89e7b 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -733,8 +733,8 @@ matrix_synapse_grafana_dashboard_urls: - https://raw.githubusercontent.com/element-hq/synapse/master/contrib/grafana/synapse.json # Controls whether Synapse metrics should be proxied (exposed) on: -# - `matrix.DOMAIN/metrics/synapse/main-process` for the main process -# - `matrix.DOMAIN/metrics/synapse/worker/{type}-{id}` for each worker process +# - `matrix.example.com/metrics/synapse/main-process` for the main process +# - `matrix.example.com/metrics/synapse/worker/{type}-{id}` for each worker process matrix_synapse_metrics_proxying_enabled: false matrix_synapse_metrics_proxying_hostname: '' matrix_synapse_metrics_proxying_path_prefix: /metrics/synapse From f9cff0ff472d283f7206310df25dd2ea05c73bdf Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 00:14:52 +0900 Subject: [PATCH 15/37] Replace MY.example.com with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bridge-appservice-slack.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-bridge-appservice-slack.md b/docs/configuring-playbook-bridge-appservice-slack.md index 4e1619b66..b2829eed7 100644 --- a/docs/configuring-playbook-bridge-appservice-slack.md +++ b/docs/configuring-playbook-bridge-appservice-slack.md @@ -40,7 +40,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se 6. Invite the bridge bot user into the admin room: ``` - /invite @slackbot:MY.example.com + /invite @slackbot:example.com ``` Note that the bot's domain is your server's domain **without the `matrix.` prefix.** @@ -81,7 +81,7 @@ loosely based on [this](https://github.com/matrix-org/matrix-appservice-slack#Se * Create a Matrix room in the usual manner for your client. Take a note of its Matrix room ID - it will look something like !aBcDeF:example.com. - * Invite the bot user to both the Slack and Matrix channels you would like to bridge using `/invite @matrixbot` for Slack and `/invite @slackbot:MY.example.com` for Matrix. + * Invite the bot user to both the Slack and Matrix channels you would like to bridge using `/invite @matrixbot` for Slack and `/invite @slackbot:example.com` for Matrix. * Determine the "channel ID" that Slack uses to identify the channel. You can see it when you open a given Slack channel in a browser. The URL reads like this: `https://app.slack.com/client/XXX//details/`. From d45657df70ea7bf52fce54e2aeb0ebd6a05de3e3 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 01:02:24 +0900 Subject: [PATCH 16/37] Replace YOUR_BARE_DOMAIN_NAME_HERE with example.com Remove an explanation about example as it is self-explanatory Signed-off-by: Suguru Hirahara --- examples/vars.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/vars.yml b/examples/vars.yml index 3eaf20de4..20ab37a43 100644 --- a/examples/vars.yml +++ b/examples/vars.yml @@ -7,9 +7,7 @@ # # If you've deployed using the wrong domain, you'll have to run the Uninstalling step, # because you can't change the Domain after deployment. -# -# Example value: example.com -matrix_domain: YOUR_BARE_DOMAIN_NAME_HERE +matrix_domain: example.com # The Matrix homeserver software to install. # See: From faa441029c37d7743ba47f684270f3e1f4cdf0e4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 01:04:56 +0900 Subject: [PATCH 17/37] Replace with example.com Signed-off-by: Suguru Hirahara --- examples/vars.yml | 4 ++-- roles/custom/matrix-base/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/vars.yml b/examples/vars.yml index 20ab37a43..b8be5f7a3 100644 --- a/examples/vars.yml +++ b/examples/vars.yml @@ -1,9 +1,9 @@ --- # The bare domain name which represents your Matrix identity. -# Matrix user ids for your server will be of the form (`@user:`). +# Matrix user ids for your server will be of the form (`@user:example.com`). # # Note: this playbook does not touch the server referenced here. -# Installation happens on another server ("matrix."). +# Installation happens on another server ("matrix.example.com"). # # If you've deployed using the wrong domain, you'll have to run the Uninstalling step, # because you can't change the Domain after deployment. diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 9cc9850cd..8bd7571b3 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -1,10 +1,10 @@ --- # The bare domain name which represents your Matrix identity. -# Matrix user ids for your server will be of the form (`@user:`). +# Matrix user ids for your server will be of the form (`@user:example.com`). # # Note: this playbook does not touch the server referenced here. -# Installation happens on another server ("matrix.", see `matrix_server_fqn_matrix`). +# Installation happens on another server ("matrix.example.com", see `matrix_server_fqn_matrix`). # # Example value: example.com matrix_domain: ~ From 1c5a8871d563ba3e8cdb19f9f34579855ac13c3c Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:19:28 +0900 Subject: [PATCH 18/37] Replace with example.com Signed-off-by: Suguru Hirahara --- README.md | 2 +- docs/configuring-dns.md | 70 +++++++++---------- docs/configuring-playbook-bot-maubot.md | 4 +- docs/configuring-playbook-client-element.md | 4 +- ...configuring-playbook-client-schildichat.md | 2 +- docs/configuring-playbook-dendrite.md | 2 +- docs/configuring-playbook-dimension.md | 6 +- docs/configuring-playbook-etherpad.md | 6 +- docs/configuring-playbook-federation.md | 6 +- docs/configuring-playbook-ntfy.md | 2 +- ...configuring-playbook-prometheus-grafana.md | 8 +-- docs/configuring-playbook-ssl-certificates.md | 2 +- ...ng-playbook-synapse-s3-storage-provider.md | 2 +- docs/configuring-playbook-synapse.md | 2 +- docs/configuring-playbook.md | 6 +- docs/configuring-well-known.md | 8 +-- docs/howto-server-delegation.md | 22 +++--- docs/prerequisites.md | 4 +- docs/registering-users.md | 2 +- docs/updating-users-passwords.md | 2 +- examples/hosts | 2 +- examples/reverse-proxies/apache/README.md | 2 +- .../caddy2-in-container/README.md | 2 +- examples/reverse-proxies/caddy2/README.md | 2 +- .../nginx-proxy-manager/README.md | 2 +- examples/reverse-proxies/nginx/README.md | 2 +- group_vars/matrix_servers | 2 +- 27 files changed, 88 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 0fa118225..401c79d3e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This [Ansible](https://www.ansible.com/) playbook is meant to help you run your own [Matrix](http://matrix.org/) homeserver, along with the [various services](#supported-services) related to that. -That is, it lets you join the Matrix network using your own `@:` identifier, all hosted on your own server (see [prerequisites](docs/prerequisites.md)). +That is, it lets you join the Matrix network using your own `@:example.com` identifier, all hosted on your own server (see [prerequisites](docs/prerequisites.md)). We run all services in [Docker](https://www.docker.com/) containers (see [the container images we use](docs/container-images.md)), which lets us have a predictable and up-to-date setup, across multiple supported distros (see [prerequisites](docs/prerequisites.md)) and [architectures](docs/alternative-architectures.md) (x86/amd64 being recommended). diff --git a/docs/configuring-dns.md b/docs/configuring-dns.md index c6c18d24d..3ecf05b83 100644 --- a/docs/configuring-dns.md +++ b/docs/configuring-dns.md @@ -2,14 +2,14 @@ To set up Matrix on your domain, you'd need to do some DNS configuration. -To use an identifier like `@:`, you don't actually need -to install anything on the actual `` server. +To use an identifier like `@:example.com`, you don't actually need +to install anything on the actual `example.com` server. -You do, however need to instruct the Matrix network that Matrix services for `` are delegated -over to `matrix.`. +You do, however need to instruct the Matrix network that Matrix services for `example.com` are delegated +over to `matrix.example.com`. As we discuss in [Server Delegation](howto-server-delegation.md), there are 2 different ways to set up such delegation: -- either by serving a `https:///.well-known/matrix/server` file (from the base domain!) +- either by serving a `https://example.com/.well-known/matrix/server` file (from the base domain!) - or by using a `_matrix._tcp` DNS SRV record (don't confuse this with the `_matrix-identity._tcp` SRV record described below) This playbook mostly discusses the well-known file method, because it's easier to manage with regard to certificates. @@ -20,7 +20,7 @@ If you decide to go with the alternative method ([Server Delegation via a DNS SR | Type | Host | Priority | Weight | Port | Target | | ----- | ---------------------------- | -------- | ------ | ---- | ---------------------- | | A | `matrix` | - | - | - | `matrix-server-IP` | -| CNAME | `element` | - | - | - | `matrix.` | +| CNAME | `element` | - | - | - | `matrix.example.com` | Be mindful as to how long it will take for the DNS records to propagate. @@ -32,20 +32,20 @@ When you're done configuring DNS, proceed to [Configuring the playbook](configur | Used by component | Type | Host | Priority | Weight | Port | Target | | ----------------------------------------------------------------------------------------------------------------------- | ----- | ------------------------------ | -------- | ------ | ---- | --------------------------- | -| [ma1sd](configuring-playbook-ma1sd.md) identity server | SRV | `_matrix-identity._tcp` | 10 | 0 | 443 | `matrix.` | -| [Dimension](configuring-playbook-dimension.md) integration server | CNAME | `dimension` | - | - | - | `matrix.` | -| [Jitsi](configuring-playbook-jitsi.md) video-conferencing platform | CNAME | `jitsi` | - | - | - | `matrix.` | -| [Prometheus/Grafana](configuring-playbook-prometheus-grafana.md) monitoring system | CNAME | `stats` | - | - | - | `matrix.` | -| [Go-NEB](configuring-playbook-bot-go-neb.md) bot | CNAME | `goneb` | - | - | - | `matrix.` | -| [Sygnal](configuring-playbook-sygnal.md) push notification gateway | CNAME | `sygnal` | - | - | - | `matrix.` | -| [ntfy](configuring-playbook-ntfy.md) push notifications server | CNAME | `ntfy` | - | - | - | `matrix.` | -| [Etherpad](configuring-playbook-etherpad.md) collaborative text editor | CNAME | `etherpad` | - | - | - | `matrix.` | -| [Hydrogen](configuring-playbook-client-hydrogen.md) web client | CNAME | `hydrogen` | - | - | - | `matrix.` | -| [Cinny](configuring-playbook-client-cinny.md) web client | CNAME | `cinny` | - | - | - | `matrix.` | -| [SchildiChat](configuring-playbook-client-schildichat.md) web client | CNAME | `schildichat` | - | - | - | `matrix.` | -| [wsproxy](configuring-playbook-bridge-mautrix-wsproxy.md) sms bridge | CNAME | `wsproxy` | - | - | - | `matrix.` | -| [Buscarron](configuring-playbook-bot-buscarron.md) helpdesk bot | CNAME | `buscarron` | - | - | - | `matrix.` | -| [Postmoogle](configuring-playbook-bot-postmoogle.md)/[Email2Matrix](configuring-playbook-email2matrix.md) email bridges | MX | `matrix` | 10 | 0 | - | `matrix.` | +| [ma1sd](configuring-playbook-ma1sd.md) identity server | SRV | `_matrix-identity._tcp` | 10 | 0 | 443 | `matrix.example.com` | +| [Dimension](configuring-playbook-dimension.md) integration server | CNAME | `dimension` | - | - | - | `matrix.example.com` | +| [Jitsi](configuring-playbook-jitsi.md) video-conferencing platform | CNAME | `jitsi` | - | - | - | `matrix.example.com` | +| [Prometheus/Grafana](configuring-playbook-prometheus-grafana.md) monitoring system | CNAME | `stats` | - | - | - | `matrix.example.com` | +| [Go-NEB](configuring-playbook-bot-go-neb.md) bot | CNAME | `goneb` | - | - | - | `matrix.example.com` | +| [Sygnal](configuring-playbook-sygnal.md) push notification gateway | CNAME | `sygnal` | - | - | - | `matrix.example.com` | +| [ntfy](configuring-playbook-ntfy.md) push notifications server | CNAME | `ntfy` | - | - | - | `matrix.example.com` | +| [Etherpad](configuring-playbook-etherpad.md) collaborative text editor | CNAME | `etherpad` | - | - | - | `matrix.example.com` | +| [Hydrogen](configuring-playbook-client-hydrogen.md) web client | CNAME | `hydrogen` | - | - | - | `matrix.example.com` | +| [Cinny](configuring-playbook-client-cinny.md) web client | CNAME | `cinny` | - | - | - | `matrix.example.com` | +| [SchildiChat](configuring-playbook-client-schildichat.md) web client | CNAME | `schildichat` | - | - | - | `matrix.example.com` | +| [wsproxy](configuring-playbook-bridge-mautrix-wsproxy.md) sms bridge | CNAME | `wsproxy` | - | - | - | `matrix.example.com` | +| [Buscarron](configuring-playbook-bot-buscarron.md) helpdesk bot | CNAME | `buscarron` | - | - | - | `matrix.example.com` | +| [Postmoogle](configuring-playbook-bot-postmoogle.md)/[Email2Matrix](configuring-playbook-email2matrix.md) email bridges | MX | `matrix` | 10 | 0 | - | `matrix.example.com` | | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge | TXT | `matrix` | - | - | - | `v=spf1 ip4: -all` | | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge | TXT | `_dmarc.matrix` | - | - | - | `v=DMARC1; p=quarantine;` | | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge | TXT | `postmoogle._domainkey.matrix` | - | - | - | get it from `!pm dkim` | @@ -54,38 +54,38 @@ When setting up a SRV record, if you are asked for a service and protocol instea ## Subdomains setup -As the table above illustrates, you need to create 2 subdomains (`matrix.` and `element.`) and point both of them to your new server's IP address (DNS `A` record or `CNAME` record is fine). +As the table above illustrates, you need to create 2 subdomains (`matrix.example.com` and `element.example.com`) and point both of them to your new server's IP address (DNS `A` record or `CNAME` record is fine). -The `element.` subdomain may be necessary, because this playbook installs the [Element](https://github.com/element-hq/element-web) web client for you. -If you'd rather instruct the playbook not to install Element (`matrix_client_element_enabled: false` when [Configuring the playbook](configuring-playbook.md) later), feel free to skip the `element.` DNS record. +The `element.example.com` subdomain may be necessary, because this playbook installs the [Element](https://github.com/element-hq/element-web) web client for you. +If you'd rather instruct the playbook not to install Element (`matrix_client_element_enabled: false` when [Configuring the playbook](configuring-playbook.md) later), feel free to skip the `element.example.com` DNS record. -The `dimension.` subdomain may be necessary, because this playbook could install the [Dimension integrations manager](http://dimension.t2bot.io/) for you. Dimension installation is disabled by default, because it's only possible to install it after the other Matrix services are working (see [Setting up Dimension](configuring-playbook-dimension.md) later). If you do not wish to set up Dimension, feel free to skip the `dimension.` DNS record. +The `dimension.example.com` subdomain may be necessary, because this playbook could install the [Dimension integrations manager](http://dimension.t2bot.io/) for you. Dimension installation is disabled by default, because it's only possible to install it after the other Matrix services are working (see [Setting up Dimension](configuring-playbook-dimension.md) later). If you do not wish to set up Dimension, feel free to skip the `dimension.example.com` DNS record. -The `jitsi.` subdomain may be necessary, because this playbook could install the [Jitsi video-conferencing platform](https://jitsi.org/) for you. Jitsi installation is disabled by default, because it may be heavy and is not a core required component. To learn how to install it, see our [Jitsi](configuring-playbook-jitsi.md) guide. If you do not wish to set up Jitsi, feel free to skip the `jitsi.` DNS record. +The `jitsi.example.com` subdomain may be necessary, because this playbook could install the [Jitsi video-conferencing platform](https://jitsi.org/) for you. Jitsi installation is disabled by default, because it may be heavy and is not a core required component. To learn how to install it, see our [Jitsi](configuring-playbook-jitsi.md) guide. If you do not wish to set up Jitsi, feel free to skip the `jitsi.example.com` DNS record. -The `stats.` subdomain may be necessary, because this playbook could install [Grafana](https://grafana.com/) and setup performance metrics for you. Grafana installation is disabled by default, it is not a core required component. To learn how to install it, see our [metrics and graphs guide](configuring-playbook-prometheus-grafana.md). If you do not wish to set up Grafana, feel free to skip the `stats.` DNS record. It is possible to install Prometheus without installing Grafana, this would also not require the `stats.` subdomain. +The `stats.example.com` subdomain may be necessary, because this playbook could install [Grafana](https://grafana.com/) and setup performance metrics for you. Grafana installation is disabled by default, it is not a core required component. To learn how to install it, see our [metrics and graphs guide](configuring-playbook-prometheus-grafana.md). If you do not wish to set up Grafana, feel free to skip the `stats.example.com` DNS record. It is possible to install Prometheus without installing Grafana, this would also not require the `stats.example.com` subdomain. -The `goneb.` subdomain may be necessary, because this playbook could install the [Go-NEB](https://github.com/matrix-org/go-neb) bot. The installation of Go-NEB is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Go-NEB guide](configuring-playbook-bot-go-neb.md). If you do not wish to set up Go-NEB, feel free to skip the `goneb.` DNS record. +The `goneb.example.com` subdomain may be necessary, because this playbook could install the [Go-NEB](https://github.com/matrix-org/go-neb) bot. The installation of Go-NEB is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Go-NEB guide](configuring-playbook-bot-go-neb.md). If you do not wish to set up Go-NEB, feel free to skip the `goneb.example.com` DNS record. -The `sygnal.` subdomain may be necessary, because this playbook could install the [Sygnal](https://github.com/matrix-org/sygnal) push gateway. The installation of Sygnal is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Sygnal guide](configuring-playbook-sygnal.md). If you do not wish to set up Sygnal (you probably don't, unless you're also developing/building your own Matrix apps), feel free to skip the `sygnal.` DNS record. +The `sygnal.example.com` subdomain may be necessary, because this playbook could install the [Sygnal](https://github.com/matrix-org/sygnal) push gateway. The installation of Sygnal is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Sygnal guide](configuring-playbook-sygnal.md). If you do not wish to set up Sygnal (you probably don't, unless you're also developing/building your own Matrix apps), feel free to skip the `sygnal.example.com` DNS record. -The `ntfy.` subdomain may be necessary, because this playbook could install the [ntfy](https://ntfy.sh/) UnifiedPush-compatible push notifications server. The installation of ntfy is disabled by default, it is not a core required component. To learn how to install it, see our [configuring ntfy guide](configuring-playbook-ntfy.md). If you do not wish to set up ntfy, feel free to skip the `ntfy.` DNS record. +The `ntfy.example.com` subdomain may be necessary, because this playbook could install the [ntfy](https://ntfy.sh/) UnifiedPush-compatible push notifications server. The installation of ntfy is disabled by default, it is not a core required component. To learn how to install it, see our [configuring ntfy guide](configuring-playbook-ntfy.md). If you do not wish to set up ntfy, feel free to skip the `ntfy.example.com` DNS record. -The `etherpad.` subdomain may be necessary, because this playbook could install the [Etherpad](https://etherpad.org/) a highly customizable open source online editor providing collaborative editing in really real-time. The installation of Etherpad is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Etherpad guide](configuring-playbook-etherpad.md). If you do not wish to set up Etherpad, feel free to skip the `etherpad.` DNS record. +The `etherpad.example.com` subdomain may be necessary, because this playbook could install the [Etherpad](https://etherpad.org/) a highly customizable open source online editor providing collaborative editing in really real-time. The installation of Etherpad is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Etherpad guide](configuring-playbook-etherpad.md). If you do not wish to set up Etherpad, feel free to skip the `etherpad.example.com` DNS record. -The `hydrogen.` subdomain may be necessary, because this playbook could install the [Hydrogen](https://github.com/element-hq/hydrogen-web) web client. The installation of Hydrogen is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Hydrogen guide](configuring-playbook-client-hydrogen.md). If you do not wish to set up Hydrogen, feel free to skip the `hydrogen.` DNS record. +The `hydrogen.example.com` subdomain may be necessary, because this playbook could install the [Hydrogen](https://github.com/element-hq/hydrogen-web) web client. The installation of Hydrogen is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Hydrogen guide](configuring-playbook-client-hydrogen.md). If you do not wish to set up Hydrogen, feel free to skip the `hydrogen.example.com` DNS record. -The `cinny.` subdomain may be necessary, because this playbook could install the [Cinny](https://github.com/ajbura/cinny) web client. The installation of Cinny is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Cinny guide](configuring-playbook-client-cinny.md). If you do not wish to set up Cinny, feel free to skip the `cinny.` DNS record. +The `cinny.example.com` subdomain may be necessary, because this playbook could install the [Cinny](https://github.com/ajbura/cinny) web client. The installation of Cinny is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Cinny guide](configuring-playbook-client-cinny.md). If you do not wish to set up Cinny, feel free to skip the `cinny.example.com` DNS record. -The `wsproxy.` subdomain may be necessary, because this playbook could install the [wsproxy](https://github.com/mautrix/wsproxy) web client. The installation of wsproxy is disabled by default, it is not a core required component. To learn how to install it, see our [configuring wsproxy guide](configuring-playbook-bridge-mautrix-wsproxy.md). If you do not wish to set up wsproxy, feel free to skip the `wsproxy.` DNS record. +The `wsproxy.example.com` subdomain may be necessary, because this playbook could install the [wsproxy](https://github.com/mautrix/wsproxy) web client. The installation of wsproxy is disabled by default, it is not a core required component. To learn how to install it, see our [configuring wsproxy guide](configuring-playbook-bridge-mautrix-wsproxy.md). If you do not wish to set up wsproxy, feel free to skip the `wsproxy.example.com` DNS record. -The `buscarron.` subdomain may be necessary, because this playbook could install the [buscarron](https://github.com/etkecc/buscarron) bot. The installation of buscarron is disabled by default, it is not a core required component. To learn how to install it, see our [configuring buscarron guide](configuring-playbook-bot-buscarron.md). If you do not wish to set up buscarron, feel free to skip the `buscarron.` DNS record. +The `buscarron.example.com` subdomain may be necessary, because this playbook could install the [buscarron](https://github.com/etkecc/buscarron) bot. The installation of buscarron is disabled by default, it is not a core required component. To learn how to install it, see our [configuring buscarron guide](configuring-playbook-bot-buscarron.md). If you do not wish to set up buscarron, feel free to skip the `buscarron.example.com` DNS record. ## `_matrix-identity._tcp` SRV record setup To make the [ma1sd](https://github.com/ma1uta/ma1sd) Identity Server (which this playbook may optionally install for you) enable its federation features, set up an SRV record that looks like this: - Name: `_matrix-identity._tcp` (use this text as-is) -- Content: `10 0 443 matrix.` (replace `` with your own) +- Content: `10 0 443 matrix.example.com` (replace `example.com` with your own) This is an optional feature for the optionally-installed [ma1sd service](configuring-playbook-ma1sd.md). See [ma1sd's documentation](https://github.com/ma1uta/ma1sd/wiki/mxisd-and-your-privacy#choices-are-never-easy) for information on the privacy implications of setting up this SRV record. diff --git a/docs/configuring-playbook-bot-maubot.md b/docs/configuring-playbook-bot-maubot.md index f435492c3..a48ab158c 100644 --- a/docs/configuring-playbook-bot-maubot.md +++ b/docs/configuring-playbook-bot-maubot.md @@ -3,7 +3,7 @@ The playbook can install and configure [maubot](https://github.com/maubot/maubot) for you. After setting up maubot, you can use the web management interface to make it do things. -The default location of the management interface is `matrix./_matrix/maubot/` +The default location of the management interface is `matrix.example.com/_matrix/maubot/` See the project's [documentation](https://docs.mau.fi/maubot/usage/basic.html) to learn what it does and why it might be useful to you. @@ -38,7 +38,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -You can visit `matrix./_matrix/maubot/` to manage your available plugins, clients and instances. +You can visit `matrix.example.com/_matrix/maubot/` to manage your available plugins, clients and instances. You should start in the following order 1. **Create one or more clients**: A client is a matrix account which the bot will use to message. By default, the playbook creates a `bot.maubot` account (as per the configuration above). You only need to [obtain an access token](#obtaining-an-access-token) for it diff --git a/docs/configuring-playbook-client-element.md b/docs/configuring-playbook-client-element.md index 1e4ef79e5..65ff2f577 100644 --- a/docs/configuring-playbook-client-element.md +++ b/docs/configuring-playbook-client-element.md @@ -5,7 +5,7 @@ By default, this playbook installs the [Element](https://github.com/element-hq/e ## Disabling Element -If you'd like for the playbook to not install Element (or to uninstall it if it was previously installed), you can disable it in your configuration file (`inventory/host_vars/matrix./vars.yml`): +If you'd like for the playbook to not install Element (or to uninstall it if it was previously installed), you can disable it in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_client_element_enabled: false @@ -18,7 +18,7 @@ The playbook provides some customization variables you could use to change Eleme Their defaults are defined in [`roles/custom/matrix-client-element/defaults/main.yml`](../roles/custom/matrix-client-element/defaults/main.yml) and they ultimately end up in the generated `/matrix/element/config.json` file (on the server). This file is generated from the [`roles/custom/matrix-client-element/templates/config.json.j2`](../roles/custom/matrix-client-element/templates/config.json.j2) template. -**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix./vars.yml`) and [re-run the playbook](installing.md) to apply the changes. +**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) and [re-run the playbook](installing.md) to apply the changes. Alternatively, **if there is no pre-defined variable** for an Element setting you wish to change: diff --git a/docs/configuring-playbook-client-schildichat.md b/docs/configuring-playbook-client-schildichat.md index 5272723cf..2a4a085f9 100644 --- a/docs/configuring-playbook-client-schildichat.md +++ b/docs/configuring-playbook-client-schildichat.md @@ -30,7 +30,7 @@ The playbook provides some customization variables you could use to change Schil Their defaults are defined in [`roles/custom/matrix-client-schildichat/defaults/main.yml`](../roles/custom/matrix-client-schildichat/defaults/main.yml) and they ultimately end up in the generated `/matrix/schildichat/config.json` file (on the server). This file is generated from the [`roles/custom/matrix-client-schildichat/templates/config.json.j2`](../roles/custom/matrix-client-schildichat/templates/config.json.j2) template. -**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix./vars.yml`) and [re-run the playbook](installing.md) to apply the changes. +**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) and [re-run the playbook](installing.md) to apply the changes. Alternatively, **if there is no pre-defined variable** for a SchildiChat setting you wish to change: diff --git a/docs/configuring-playbook-dendrite.md b/docs/configuring-playbook-dendrite.md index 01c80cff5..0b72ed0fa 100644 --- a/docs/configuring-playbook-dendrite.md +++ b/docs/configuring-playbook-dendrite.md @@ -10,7 +10,7 @@ By default, this playbook configures the [Synapse](https://github.com/element-hq The playbook provided settings for Dendrite are defined in [`roles/custom/matrix-dendrite/defaults/main.yml`](../roles/custom/matrix-dendrite/defaults/main.yml) and they ultimately end up in the generated `/matrix/dendrite/config/dendrite.yaml` file (on the server). This file is generated from the [`roles/custom/matrix-dendrite/templates/dendrite/dendrite.yaml.j2`](../roles/custom/matrix-dendrite/templates/dendrite/dendrite.yaml.j2) template. -**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix./vars.yml`) and [re-run the playbook](installing.md) to apply the changes. +**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) and [re-run the playbook](installing.md) to apply the changes. Alternatively, **if there is no pre-defined variable** for a Dendrite setting you wish to change: diff --git a/docs/configuring-playbook-dimension.md b/docs/configuring-playbook-dimension.md index 9deb41f27..2099ccf0c 100644 --- a/docs/configuring-playbook-dimension.md +++ b/docs/configuring-playbook-dimension.md @@ -30,7 +30,7 @@ Once you've decided on the domain and path, **you may need to adjust your DNS** ## Enable -To enable Dimension, add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): +To enable Dimension, add this to your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_dimension_enabled: true @@ -40,7 +40,7 @@ matrix_dimension_enabled: true ## Define admin users These users can modify the integrations this Dimension supports. -Add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): +Add this to your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_dimension_admins: @@ -60,7 +60,7 @@ To get an access token for the Dimension user, you can follow the documentation **Access tokens are sensitive information. Do not include them in any bug reports, messages, or logs. Do not share the access token with anyone.** -Add access token to your configuration file (`inventory/host_vars/matrix./vars.yml`): +Add access token to your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_dimension_access_token: "YOUR ACCESS TOKEN HERE" diff --git a/docs/configuring-playbook-etherpad.md b/docs/configuring-playbook-etherpad.md index a33976623..4810c24d6 100644 --- a/docs/configuring-playbook-etherpad.md +++ b/docs/configuring-playbook-etherpad.md @@ -46,7 +46,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` ## Usage -The Etherpad UI should be available at `https://etherpad.`, while the admin UI (if enabled) should then be available at `https://etherpad./admin`. +The Etherpad UI should be available at `https://etherpad.example.com`, while the admin UI (if enabled) should then be available at `https://etherpad.example.com/admin`. If you've [decided on another hostname or path-prefix](#decide-on-a-domain-and-path) (e.g. `https://matrix.example.com/etherpad`), adjust these URLs accordingly before usage. @@ -55,7 +55,7 @@ If you've [decided on another hostname or path-prefix](#decide-on-a-domain-and-p If you want to manage and remove old unused pads from Etherpad, you will first need to able Admin access as described above. -Then from the plugin manager page (`https://etherpad./admin/plugins`, install the `adminpads2` plugin. Once installed, you should have a "Manage pads" section in the Admin web-UI. +Then from the plugin manager page (`https://etherpad.example.com/admin/plugins`, install the `adminpads2` plugin. Once installed, you should have a "Manage pads" section in the Admin web-UI. ### How to use Etherpad widgets without an Integration Manager (like Dimension) @@ -76,7 +76,7 @@ The Dimension configuration menu can be accessed with the sprocket icon as you b If you wish to disable the Etherpad chat button, you can do it by appending `?showChat=false` to the end of the pad URL, or the template. -Example: `https://etherpad./p/$roomId_$padName?showChat=false` +Example: `https://etherpad.example.com/p/$roomId_$padName?showChat=false` ## Known issues diff --git a/docs/configuring-playbook-federation.md b/docs/configuring-playbook-federation.md index 6ebe32bbd..54ec6b4b0 100644 --- a/docs/configuring-playbook-federation.md +++ b/docs/configuring-playbook-federation.md @@ -21,7 +21,7 @@ If you wish to disable federation, you can do that with an empty list (`[]`), or By default, your server's public rooms directory is not exposed to other servers via federation. -If you wish to expose it, add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): +If you wish to expose it, add this to your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_synapse_allow_public_rooms_over_federation: true @@ -30,7 +30,7 @@ matrix_synapse_allow_public_rooms_over_federation: true ## Disabling federation -To completely disable federation, isolating your server from the rest of the Matrix network, add this to your configuration file (`inventory/host_vars/matrix./vars.yml`): +To completely disable federation, isolating your server from the rest of the Matrix network, add this to your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_homeserver_federation_enabled: false @@ -55,7 +55,7 @@ matrix_synapse_reverse_proxy_companion_federation_api_enabled: false Why? This change could be useful for people running small Synapse instances on small severs/VPSes to avoid being impacted by a simple DOS/DDOS when bandwidth, RAM, an CPU resources are limited and if your hosting provider does not provide a DOS/DDOS protection. -The following changes in the configuration file (`inventory/host_vars/matrix./vars.yml`) will allow this and make it possible to proxy the federation through a CDN such as CloudFlare or any other: +The following changes in the configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) will allow this and make it possible to proxy the federation through a CDN such as CloudFlare or any other: ``` matrix_synapse_http_listener_resource_names: ["client","federation"] diff --git a/docs/configuring-playbook-ntfy.md b/docs/configuring-playbook-ntfy.md index 17977cf98..ad227d3ff 100644 --- a/docs/configuring-playbook-ntfy.md +++ b/docs/configuring-playbook-ntfy.md @@ -35,7 +35,7 @@ For a complete list of ntfy config options that you could put in `ntfy_configura ## Installing -Don't forget to add `ntfy.` to DNS as described in [Configuring DNS](configuring-dns.md) before running the playbook. +Don't forget to add `ntfy.example.com` to DNS as described in [Configuring DNS](configuring-dns.md) before running the playbook. After configuring the playbook, run the [installation](installing.md) command: diff --git a/docs/configuring-playbook-prometheus-grafana.md b/docs/configuring-playbook-prometheus-grafana.md index c984c86f7..d1f2e2fa5 100644 --- a/docs/configuring-playbook-prometheus-grafana.md +++ b/docs/configuring-playbook-prometheus-grafana.md @@ -2,9 +2,9 @@ It can be useful to have some (visual) insight into the performance of your homeserver. -You can enable this with the following settings in your configuration file (`inventory/host_vars/matrix./vars.yml`): +You can enable this with the following settings in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): -Remember to add `stats.` to DNS as described in [Configuring DNS](configuring-dns.md) before running the playbook. +Remember to add `stats.example.com` to DNS as described in [Configuring DNS](configuring-dns.md) before running the playbook. ```yaml prometheus_enabled: true @@ -30,7 +30,7 @@ grafana_default_admin_user: "some_username_chosen_by_you" grafana_default_admin_password: "some_strong_password_chosen_by_you" ``` -By default, a [Grafana](https://grafana.com/) web user-interface will be available at `https://stats.`. +By default, a [Grafana](https://grafana.com/) web user-interface will be available at `https://stats.example.com`. The retention policy of Prometheus metrics is [15 days by default](https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects). Older data gets deleted automatically. @@ -43,7 +43,7 @@ Name | Description `prometheus_node_exporter_enabled`|[Node Exporter](https://prometheus.io/docs/guides/node-exporter/) is an addon of sorts to Prometheus that collects generic system information such as CPU, memory, filesystem, and even system temperatures `prometheus_postgres_exporter_enabled`|[Postgres Exporter](configuring-playbook-prometheus-postgres.md) is an addon of sorts to expose Postgres database metrics to Prometheus. `matrix_prometheus_nginxlog_exporter_enabled`|[NGINX Log Exporter](configuring-playbook-prometheus-nginxlog.md) is an addon of sorts to expose NGINX logs to Prometheus. -`grafana_enabled`|[Grafana](https://grafana.com/) is the visual component. It shows (on the `stats.` subdomain) the dashboards with the graphs that we're interested in +`grafana_enabled`|[Grafana](https://grafana.com/) is the visual component. It shows (on the `stats.example.com` subdomain) the dashboards with the graphs that we're interested in `grafana_anonymous_access`|By default you need to log in to see graphs. If you want to publicly share your graphs (e.g. when asking for help in [`#synapse:matrix.org`](https://matrix.to/#/#synapse:matrix.org?via=matrix.org&via=privacytools.io&via=mozilla.org)) you'll want to enable this option. `grafana_default_admin_user`
`grafana_default_admin_password`|By default Grafana creates a user with `admin` as the username and password. If you feel this is insecure and you want to change it beforehand, you can do that here diff --git a/docs/configuring-playbook-ssl-certificates.md b/docs/configuring-playbook-ssl-certificates.md index 583bc0b11..31799b37f 100644 --- a/docs/configuring-playbook-ssl-certificates.md +++ b/docs/configuring-playbook-ssl-certificates.md @@ -1,6 +1,6 @@ # Adjusting SSL certificate retrieval (optional, advanced) -By default, this playbook retrieves and auto-renews free SSL certificates from [Let's Encrypt](https://letsencrypt.org/) for the domains it needs (e.g. `matrix.` and others) +By default, this playbook retrieves and auto-renews free SSL certificates from [Let's Encrypt](https://letsencrypt.org/) for the domains it needs (e.g. `matrix.example.com` and others) This guide is about using the integrated Traefik server and doesn't apply if you're using [your own webserver](configuring-playbook-own-webserver.md). diff --git a/docs/configuring-playbook-synapse-s3-storage-provider.md b/docs/configuring-playbook-synapse-s3-storage-provider.md index a5887a33d..718588b18 100644 --- a/docs/configuring-playbook-synapse-s3-storage-provider.md +++ b/docs/configuring-playbook-synapse-s3-storage-provider.md @@ -26,7 +26,7 @@ While you will need some local disk space around, it's only to accommodate usage ## Installing -After [creating the S3 bucket and configuring it](configuring-playbook-s3.md#bucket-creation-and-security-configuration), you can proceed to configure `s3-storage-provider` in your configuration file (`inventory/host_vars/matrix./vars.yml`): +After [creating the S3 bucket and configuring it](configuring-playbook-s3.md#bucket-creation-and-security-configuration), you can proceed to configure `s3-storage-provider` in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`): ```yaml matrix_synapse_ext_synapse_s3_storage_provider_enabled: true diff --git a/docs/configuring-playbook-synapse.md b/docs/configuring-playbook-synapse.md index f5a08ae5a..e0e04cf07 100644 --- a/docs/configuring-playbook-synapse.md +++ b/docs/configuring-playbook-synapse.md @@ -6,7 +6,7 @@ The playbook provides lots of customization variables you could use to change Sy Their defaults are defined in [`roles/custom/matrix-synapse/defaults/main.yml`](../roles/custom/matrix-synapse/defaults/main.yml) and they ultimately end up in the generated `/matrix/synapse/config/homeserver.yaml` file (on the server). This file is generated from the [`roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2`](../roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2) template. -**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix./vars.yml`) and [re-run the playbook](installing.md) to apply the changes. +**If there's an existing variable** which controls a setting you wish to change, you can simply define that variable in your configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) and [re-run the playbook](installing.md) to apply the changes. Alternatively, **if there is no pre-defined variable** for a Synapse setting you wish to change: diff --git a/docs/configuring-playbook.md b/docs/configuring-playbook.md index 4b4a3366b..d79c9491e 100644 --- a/docs/configuring-playbook.md +++ b/docs/configuring-playbook.md @@ -8,11 +8,11 @@ To configure the playbook, you need to have done the following things: You can then follow these steps inside the playbook directory: -1. create a directory to hold your configuration (`mkdir -p inventory/host_vars/matrix.`) +1. create a directory to hold your configuration (`mkdir -p inventory/host_vars/matrix.example.com`) -1. copy the sample configuration file (`cp examples/vars.yml inventory/host_vars/matrix./vars.yml`) +1. copy the sample configuration file (`cp examples/vars.yml inventory/host_vars/matrix.example.com/vars.yml`) -1. edit the configuration file (`inventory/host_vars/matrix./vars.yml`) to your liking. You may also take a look at the various `roles/*/ROLE_NAME_HERE/defaults/main.yml` files and see if there's something you'd like to copy over and override in your `vars.yml` configuration file. +1. edit the configuration file (`inventory/host_vars/matrix.example.com/vars.yml`) to your liking. You may also take a look at the various `roles/*/ROLE_NAME_HERE/defaults/main.yml` files and see if there's something you'd like to copy over and override in your `vars.yml` configuration file. 1. copy the sample inventory hosts file (`cp examples/hosts inventory/hosts`) diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index fb5ec1b18..3bd8c5be3 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -11,11 +11,11 @@ There are 2 types of well-known service discovery that Matrix makes use of: ## Introduction to Federation Server Discovery -All services created by this playbook are meant to be installed on their own server (such as `matrix.`). +All services created by this playbook are meant to be installed on their own server (such as `matrix.example.com`). -As [per the Server-Server specification](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery), to use a Matrix user identifier like `@:` while hosting services on a subdomain like `matrix.`, the Matrix network needs to be instructed of such delegation/redirection. +As [per the Server-Server specification](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery), to use a Matrix user identifier like `@:example.com` while hosting services on a subdomain like `matrix.example.com`, the Matrix network needs to be instructed of such delegation/redirection. -Server delegation can be configured using DNS SRV records or by setting up a `/.well-known/matrix/server` file on the base domain (``). +Server delegation can be configured using DNS SRV records or by setting up a `/.well-known/matrix/server` file on the base domain (`example.com`). Both methods have their place and will continue to do so. You only need to use just one of these delegation methods. For simplicity reasons, our setup advocates for the `/.well-known/matrix/server` method and guides you into using that. @@ -178,7 +178,7 @@ backend matrix-backend **For AWS CloudFront** - 1. Add a custom origin with matrix. to your distribution + 1. Add a custom origin with matrix.example.com to your distribution 1. Add two behaviors, one for `.well-known/matrix/client` and one for `.well-known/matrix/server` and point them to your new origin. Make sure to: diff --git a/docs/howto-server-delegation.md b/docs/howto-server-delegation.md index 38374d4c6..d4386fb04 100644 --- a/docs/howto-server-delegation.md +++ b/docs/howto-server-delegation.md @@ -1,6 +1,6 @@ # Server Delegation -To have a server on a subdomain (e.g. `matrix.`) handle Matrix federation traffic for the base domain (``), we need to instruct the Matrix network of such a delegation. +To have a server on a subdomain (e.g. `matrix.example.com`) handle Matrix federation traffic for the base domain (`example.com`), we need to instruct the Matrix network of such a delegation. By default, this playbook guides you into setting up [Server Delegation via a well-known file](#server-delegation-via-a-well-known-file). However, that method may have some downsides that are not to your liking. Hence this guide about alternative ways to set up Server Delegation. @@ -13,7 +13,7 @@ It is a complicated matter, so unless you are affected by the [Downsides of well Serving a `/.well-known/matrix/server` file from the base domain is the most straightforward way to set up server delegation, but it suffers from some problems that we list in [Downsides of well-known-based Server Delegation](#downsides-of-well-known-based-server-delegation). As we already mention in [Configuring DNS](configuring-dns.md) and [Configuring Service Discovery via .well-known](configuring-well-known.md), -this playbook already properly guides you into setting up such delegation by means of a `/.well-known/matrix/server` file served from the base domain (``). +this playbook already properly guides you into setting up such delegation by means of a `/.well-known/matrix/server` file served from the base domain (`example.com`). If this is okay with you, feel free to not read ahead. @@ -22,9 +22,9 @@ If this is okay with you, feel free to not read ahead. Server Delegation by means of a `/.well-known/matrix/server` file is the most straightforward, but suffers from the following downsides: -- you need to have a working HTTPS server for the base domain (``). If you don't have any server for the base domain at all, you can easily solve it by making the playbook [serve the base domain from the Matrix server](configuring-playbook-base-domain-serving.md). +- you need to have a working HTTPS server for the base domain (`example.com`). If you don't have any server for the base domain at all, you can easily solve it by making the playbook [serve the base domain from the Matrix server](configuring-playbook-base-domain-serving.md). -- any downtime on the base domain (``) or network trouble between the matrix subdomain (`matrix.`) and the base `` may cause Matrix Federation outages. As the [Server-Server spec says](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery): +- any downtime on the base domain (`example.com`) or network trouble between the matrix subdomain (`matrix.example.com`) and the base `` may cause Matrix Federation outages. As the [Server-Server spec says](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery): > Errors are recommended to be cached for up to an hour, and servers are encouraged to exponentially back off for repeated failures. @@ -45,25 +45,25 @@ To use DNS SRV record validation, you need to: - ensure that `/.well-known/matrix/server` is **not served** from the base domain, as that would interfere with DNS SRV record Server Delegation. To make the playbook **not** generate and serve the file, use the following configuration: `matrix_static_files_file_matrix_server_enabled: false`. -- ensure that you have a `_matrix._tcp` DNS SRV record for your base domain (``) with a value of `10 0 8448 matrix.` +- ensure that you have a `_matrix._tcp` DNS SRV record for your base domain (`example.com`) with a value of `10 0 8448 matrix.example.com` -- ensure that you are serving the Matrix Federation API (tcp/8448) with a certificate for `` (not `matrix.`!). Getting this certificate to the `matrix.` server may be complicated. The playbook's automatic SSL obtaining/renewal flow will likely not work and you'll need to copy certificates around manually. See below. +- ensure that you are serving the Matrix Federation API (tcp/8448) with a certificate for `example.com` (not `matrix.example.com`!). Getting this certificate to the `matrix.example.com` server may be complicated. The playbook's automatic SSL obtaining/renewal flow will likely not work and you'll need to copy certificates around manually. See below. For more details on [how to configure the playbook to work with SRV delegation](howto-srv-server-delegation.md) ### Obtaining certificates -How you can obtain a valid certificate for `` on the `matrix.` server is up to you. +How you can obtain a valid certificate for `example.com` on the `matrix.example.com` server is up to you. -If `` and `matrix.` are hosted on the same machine, you can let the playbook obtain the certificate for you, by following our [Obtaining SSL certificates for additional domains](configuring-playbook-ssl-certificates.md#obtaining-ssl-certificates-for-additional-domains) guide. +If `example.com` and `matrix.example.com` are hosted on the same machine, you can let the playbook obtain the certificate for you, by following our [Obtaining SSL certificates for additional domains](configuring-playbook-ssl-certificates.md#obtaining-ssl-certificates-for-additional-domains) guide. -If `` and `matrix.` are not hosted on the same machine, you can copy over the certificate files manually. +If `example.com` and `matrix.example.com` are not hosted on the same machine, you can copy over the certificate files manually. Don't forget that they may get renewed once in a while, so you may also have to transfer them periodically. How often you do that is up to you, as long as the certificate files don't expire. ### Serving the Federation API with your certificates -Regardless of which method for obtaining certificates you've used, once you've managed to get certificates for your base domain onto the `matrix.` machine you can put them to use. +Regardless of which method for obtaining certificates you've used, once you've managed to get certificates for your base domain onto the `matrix.example.com` machine you can put them to use. Based on your setup, you have different ways to go about it: @@ -82,7 +82,7 @@ Based on your setup, you have different ways to go about it: ### Serving the Federation API with your certificates and another webserver **If you are using some other webserver**, you can set up reverse-proxying for the `tcp/8448` port by yourself. -Make sure to use the proper certificates for `` (not for `matrix.`) when serving the `tcp/8448` port. +Make sure to use the proper certificates for `example.com` (not for `matrix.example.com`) when serving the `tcp/8448` port. As recommended in our [Fronting the integrated reverse-proxy webserver with another reverse-proxy](./configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) documentation section, we recommend you to expose the Matrix Federation entrypoint from traffic at a local port (e.g. `127.0.0.1:8449`), so your reverese-proxy should send traffic there. diff --git a/docs/prerequisites.md b/docs/prerequisites.md index 1db7338df..24baabedb 100644 --- a/docs/prerequisites.md +++ b/docs/prerequisites.md @@ -28,9 +28,9 @@ To install Matrix services using this Ansible playbook, you need: - [`just`](https://github.com/casey/just) for running `just roles`, `just update`, etc. (see [`justfile`](../justfile)), although you can also run these commands manually -- An HTTPS-capable web server at the base domain name (``) which is capable of serving static files. Unless you decide to [Serve the base domain from the Matrix server](configuring-playbook-base-domain-serving.md) or alternatively, to use DNS SRV records for [Server Delegation](howto-server-delegation.md). +- An HTTPS-capable web server at the base domain name (`example.com`) which is capable of serving static files. Unless you decide to [Serve the base domain from the Matrix server](configuring-playbook-base-domain-serving.md) or alternatively, to use DNS SRV records for [Server Delegation](howto-server-delegation.md). -- Properly configured DNS records for `` (details in [Configuring DNS](configuring-dns.md)). +- Properly configured DNS records for `example.com` (details in [Configuring DNS](configuring-dns.md)). - Some TCP/UDP ports open. This playbook (actually [Docker itself](https://docs.docker.com/network/iptables/)) configures the server's internal firewall for you. In most cases, you don't need to do anything special. But **if your server is running behind another firewall**, you'd need to open these ports: diff --git a/docs/registering-users.md b/docs/registering-users.md index b6cd32852..d725e8486 100644 --- a/docs/registering-users.md +++ b/docs/registering-users.md @@ -34,7 +34,7 @@ ansible-playbook -i inventory/hosts setup.yml --extra-vars='username= ``` -**Note**: `` is just a plain username (like `john`), not your full `@:` identifier. +**Note**: `` is just a plain username (like `john`), not your full `@:example.com` identifier. **You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element./`. diff --git a/docs/updating-users-passwords.md b/docs/updating-users-passwords.md index 953045b3a..5dd764788 100644 --- a/docs/updating-users-passwords.md +++ b/docs/updating-users-passwords.md @@ -8,7 +8,7 @@ You can reset a user's password via the Ansible playbook (make sure to edit the ansible-playbook -i inventory/hosts setup.yml --extra-vars='username= password=' --tags=update-user-password ``` -**Note**: `` is just a plain username (like `john`), not your full `@:` identifier. +**Note**: `` is just a plain username (like `john`), not your full `@:example.com` identifier. **You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element./`. diff --git a/examples/hosts b/examples/hosts index cb6459f97..d9407b2ab 100644 --- a/examples/hosts +++ b/examples/hosts @@ -18,4 +18,4 @@ # to the host line below. [matrix_servers] -matrix. ansible_host= ansible_ssh_user=root +matrix.example.com ansible_host= ansible_ssh_user=root diff --git a/examples/reverse-proxies/apache/README.md b/examples/reverse-proxies/apache/README.md index 939df3f22..da349db74 100644 --- a/examples/reverse-proxies/apache/README.md +++ b/examples/reverse-proxies/apache/README.md @@ -4,7 +4,7 @@ This directory contains sample files that show you how to front the integrated [ ## Prerequisite configuration -To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix./vars.yml`). +To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix.example.com/vars.yml`). ## Using the Apache configuration diff --git a/examples/reverse-proxies/caddy2-in-container/README.md b/examples/reverse-proxies/caddy2-in-container/README.md index 925547f4e..be654f0d5 100644 --- a/examples/reverse-proxies/caddy2-in-container/README.md +++ b/examples/reverse-proxies/caddy2-in-container/README.md @@ -7,7 +7,7 @@ This directory contains a sample config that shows you how to front the integrat ## Prerequisite configuration -To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix./vars.yml`). +To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix.example.com/vars.yml`). Then, adjust your Caddy `docker-compose.yaml` file (if you're using docker-compose for running your Caddy container). See [examples/reverse-proxies/caddy2-in-container/docker-compose.yaml](./docker-compose.yaml). diff --git a/examples/reverse-proxies/caddy2/README.md b/examples/reverse-proxies/caddy2/README.md index 0c73fce5d..06500f095 100644 --- a/examples/reverse-proxies/caddy2/README.md +++ b/examples/reverse-proxies/caddy2/README.md @@ -5,7 +5,7 @@ This directory contains a sample config that shows you how to front the integrat ## Prerequisite configuration -To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix./vars.yml`). +To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix.example.com/vars.yml`). ## Using the Caddyfile diff --git a/examples/reverse-proxies/nginx-proxy-manager/README.md b/examples/reverse-proxies/nginx-proxy-manager/README.md index aa7a7b53e..5a3e3cc96 100644 --- a/examples/reverse-proxies/nginx-proxy-manager/README.md +++ b/examples/reverse-proxies/nginx-proxy-manager/README.md @@ -7,7 +7,7 @@ This page summarizes how to use Nginx Proxy Manager (NPM) to front the integrate ## Prerequisite configuration -To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix./vars.yml`). +To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix.example.com/vars.yml`). If Matrix federation is enabled, then you will need to make changes to [NPM's Docker configuration](https://nginxproxymanager.com/guide/#quick-setup). By default NPM already exposes ports `80` and `443`, but you would also need to **additionally expose the Matrix Federation port** (as it appears on the public side): `8448`. diff --git a/examples/reverse-proxies/nginx/README.md b/examples/reverse-proxies/nginx/README.md index b57d4557d..67381c4f2 100644 --- a/examples/reverse-proxies/nginx/README.md +++ b/examples/reverse-proxies/nginx/README.md @@ -5,7 +5,7 @@ This directory contains a sample config that shows you how to use the [nginx](ht ## Prerequisite configuration -To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix./vars.yml`). +To get started, first follow the [front the integrated reverse-proxy webserver with another reverse-proxy](../../../docs/configuring-playbook-own-webserver.md#fronting-the-integrated-reverse-proxy-webserver-with-another-reverse-proxy) instructions and update your playbook's configuration (`inventory/host_vars/matrix.example.com/vars.yml`). ## Using the nginx configuration diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index e0f7f907b..44d9c1360 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -7,7 +7,7 @@ # to connect them all together. It does so by overriding role variables. # # You can also override ANY variable (seen here or in any given role), -# by re-defining it in your own configuration file (`inventory/host_vars/matrix.`). +# by re-defining it in your own configuration file (`inventory/host_vars/matrix.example.com`). ######################################################################## # # From 3fb2752714e2e644881dff942298585816502953 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 02:22:34 +0900 Subject: [PATCH 19/37] Replace (your.)server.name with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-conduit.md | 2 +- .../matrix-bridge-appservice-irc/templates/config.yaml.j2 | 2 +- roles/custom/matrix-conduit/templates/conduit.toml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuring-playbook-conduit.md b/docs/configuring-playbook-conduit.md index 88e1d883f..6d807c558 100644 --- a/docs/configuring-playbook-conduit.md +++ b/docs/configuring-playbook-conduit.md @@ -36,7 +36,7 @@ You will have to manually register appservices using the the [register-appservic Find the `registration.yaml` in the `/matrix` directory, for example `/matrix/mautrix-signal/bridge/registration.yaml`, then pass the content to Conduit: - @conduit:your.server.name: register-appservice + @conduit:example.com: register-appservice ``` as_token: de.sorunome.msc2409.push_ephemeral: true diff --git a/roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2 b/roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2 index 94bbda7b8..65af4ddcf 100644 --- a/roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-appservice-irc/templates/config.yaml.j2 @@ -41,7 +41,7 @@ ircService: # # The path to the RSA PEM-formatted private key to use when encrypting IRC passwords # for storage in the database. Passwords are stored by using the admin room command - # `!storepass server.name passw0rd. When a connection is made to IRC on behalf of + # `!storepass example.com passw0rd. When a connection is made to IRC on behalf of # the Matrix user, this password will be sent as the server password (PASS command). passwordEncryptionKeyPath: "/data/passkey.pem" # does not typically need modification diff --git a/roles/custom/matrix-conduit/templates/conduit.toml.j2 b/roles/custom/matrix-conduit/templates/conduit.toml.j2 index be490cd2a..42f215f5a 100644 --- a/roles/custom/matrix-conduit/templates/conduit.toml.j2 +++ b/roles/custom/matrix-conduit/templates/conduit.toml.j2 @@ -10,7 +10,7 @@ # and room IDs. Examples: matrix.org, conduit.rs # The Conduit server needs all /_matrix/ requests to be reachable at -# https://your.server.name/ on port 443 (client-server) and 8448 (federation). +# https://example.com/ on port 443 (client-server) and 8448 (federation). # If that's not possible for you, you can create /.well-known files to redirect # requests. See From ff4155e0333c4b925829d19c31c087337b5c06dd Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 02:32:31 +0900 Subject: [PATCH 20/37] Replace yourserver.com with example.com Signed-off-by: Suguru Hirahara --- .../custom/matrix-bridge-mx-puppet-discord/defaults/main.yml | 4 ++-- .../custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml | 4 ++-- .../matrix-bridge-mx-puppet-instagram/defaults/main.yml | 4 ++-- roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml | 4 ++-- roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml | 4 ++-- .../custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml index 8d328521d..8bd1320b3 100644 --- a/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml @@ -34,14 +34,14 @@ matrix_mx_puppet_discord_appservice_address: 'http://matrix-mx-puppet-discord:{{ matrix_mx_puppet_discord_bridge_mediaUrl: "{{ matrix_homeserver_url }}" # noqa var-naming # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_discord_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_discord_provisioning_blacklist: [] matrix_mx_puppet_discord_container_network: "" diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml index c8277aa6a..09cd5ee59 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml @@ -30,14 +30,14 @@ matrix_mx_puppet_groupme_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_groupme_appservice_address: 'http://matrix-mx-puppet-groupme:{{ matrix_mx_puppet_groupme_appservice_port }}' # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_groupme_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_groupme_provisioning_blacklist: [] matrix_mx_puppet_groupme_container_network: "" diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml index 9d86b5d08..ba7f993df 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml @@ -25,14 +25,14 @@ matrix_mx_puppet_instagram_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_instagram_appservice_address: 'http://matrix-mx-puppet-instagram:{{ matrix_mx_puppet_instagram_appservice_port }}' # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_instagram_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_instagram_provisioning_blacklist: [] matrix_mx_puppet_instagram_container_network: "" diff --git a/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml index 322f16031..9d9189a84 100644 --- a/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml @@ -43,14 +43,14 @@ matrix_mx_puppet_slack_oauth_redirect_path: "{{ matrix_mx_puppet_slack_path_pref matrix_mx_puppet_slack_oauth_redirect_uri: '{{ matrix_mx_puppet_slack_scheme }}://{{ matrix_mx_puppet_slack_hostname }}{{ matrix_mx_puppet_slack_oauth_redirect_path }}' # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_slack_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_slack_provisioning_blacklist: [] matrix_mx_puppet_slack_container_network: "" diff --git a/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml index 73cb131f0..5c28aaad3 100644 --- a/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml @@ -31,14 +31,14 @@ matrix_mx_puppet_steam_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_steam_appservice_address: 'http://matrix-mx-puppet-steam:{{ matrix_mx_puppet_steam_appservice_port }}' # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_steam_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_steam_provisioning_blacklist: [] matrix_mx_puppet_steam_container_network: "" diff --git a/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml index 1ba4a9920..a09ba4afa 100644 --- a/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml @@ -43,14 +43,14 @@ matrix_mx_puppet_twitter_server_path: "{{ matrix_mx_puppet_twitter_path_prefix } matrix_mx_puppet_twitter_server_url: '{{ matrix_homeserver_url }}{{ matrix_mx_puppet_twitter_server_path }}' # "@user:server.com" to allow specific user -# "@.*:yourserver.com" to allow users on a specific homeserver +# "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_twitter_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist # "@user:server.com" disallow a specific user -# "@.*:yourserver.com" disallow users on a specific homeserver +# "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_twitter_provisioning_blacklist: [] matrix_mx_puppet_twitter_container_network: "" From ee55138f5755a4fbc03e3566abb323b5b03f3730 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 02:33:36 +0900 Subject: [PATCH 21/37] Replace your-homeserver.com with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-cactus-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-cactus-comments.md b/docs/configuring-playbook-cactus-comments.md index f5e124c08..8f18b1a84 100644 --- a/docs/configuring-playbook-cactus-comments.md +++ b/docs/configuring-playbook-cactus-comments.md @@ -52,7 +52,7 @@ After configuring the playbook, run the [installation](installing.md) command: ` Upon starting Cactus Comments, a `bot.cactusbot` user account is created automatically. -To get started, send a `help` message to the `@bot.cactusbot:your-homeserver.com` bot to confirm it's working. +To get started, send a `help` message to the `@bot.cactusbot:example.com` bot to confirm it's working. Then, register a site by typing: `register `. You will then be invited into a moderation room. From 9089963fa8071a41b53db13973d3635ba7734c8b Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 02:35:17 +0900 Subject: [PATCH 22/37] Replace server.com with example.com Signed-off-by: Suguru Hirahara --- docs/updating-users-passwords.md | 2 +- .../custom/matrix-bridge-mx-puppet-discord/defaults/main.yml | 4 ++-- .../custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml | 4 ++-- .../matrix-bridge-mx-puppet-instagram/defaults/main.yml | 4 ++-- roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml | 4 ++-- roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml | 4 ++-- .../custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml | 4 ++-- roles/custom/matrix-dendrite/defaults/main.yml | 2 +- roles/custom/matrix-synapse/defaults/main.yml | 2 +- .../matrix-synapse/templates/synapse/homeserver.yaml.j2 | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/updating-users-passwords.md b/docs/updating-users-passwords.md index 5dd764788..bfa74ce44 100644 --- a/docs/updating-users-passwords.md +++ b/docs/updating-users-passwords.md @@ -24,7 +24,7 @@ docker exec -it matrix-synapse /usr/local/bin/hash_password -c /data/homeserver. and then connecting to the postgres server and executing: ``` -UPDATE users SET password_hash = '' WHERE name = '@someone:server.com' +UPDATE users SET password_hash = '' WHERE name = '@someone:example.com' ``` where `` is the hash returned by the docker command above. diff --git a/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml index 8bd1320b3..deecd4555 100644 --- a/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-discord/defaults/main.yml @@ -33,14 +33,14 @@ matrix_mx_puppet_discord_appservice_address: 'http://matrix-mx-puppet-discord:{{ matrix_mx_puppet_discord_bridge_mediaUrl: "{{ matrix_homeserver_url }}" # noqa var-naming -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_discord_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_discord_provisioning_blacklist: [] diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml index 09cd5ee59..68e5e4250 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml @@ -29,14 +29,14 @@ matrix_mx_puppet_groupme_homeserver_address: "" matrix_mx_puppet_groupme_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_groupme_appservice_address: 'http://matrix-mx-puppet-groupme:{{ matrix_mx_puppet_groupme_appservice_port }}' -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_groupme_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_groupme_provisioning_blacklist: [] diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml index ba7f993df..ccee80ec9 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/defaults/main.yml @@ -24,14 +24,14 @@ matrix_mx_puppet_instagram_homeserver_address: "" matrix_mx_puppet_instagram_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_instagram_appservice_address: 'http://matrix-mx-puppet-instagram:{{ matrix_mx_puppet_instagram_appservice_port }}' -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_instagram_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_instagram_provisioning_blacklist: [] diff --git a/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml index 9d9189a84..c9067eb97 100644 --- a/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-slack/defaults/main.yml @@ -42,14 +42,14 @@ matrix_mx_puppet_slack_oauth_enabled: true matrix_mx_puppet_slack_oauth_redirect_path: "{{ matrix_mx_puppet_slack_path_prefix }}" matrix_mx_puppet_slack_oauth_redirect_uri: '{{ matrix_mx_puppet_slack_scheme }}://{{ matrix_mx_puppet_slack_hostname }}{{ matrix_mx_puppet_slack_oauth_redirect_path }}' -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_slack_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_slack_provisioning_blacklist: [] diff --git a/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml index 5c28aaad3..73e019384 100644 --- a/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml @@ -30,14 +30,14 @@ matrix_mx_puppet_steam_homeserver_address: "" matrix_mx_puppet_steam_homeserver_domain: '{{ matrix_domain }}' matrix_mx_puppet_steam_appservice_address: 'http://matrix-mx-puppet-steam:{{ matrix_mx_puppet_steam_appservice_port }}' -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_steam_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_steam_provisioning_blacklist: [] diff --git a/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml index a09ba4afa..60bc075f3 100644 --- a/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-twitter/defaults/main.yml @@ -42,14 +42,14 @@ matrix_mx_puppet_twitter_environment: '' matrix_mx_puppet_twitter_server_path: "{{ matrix_mx_puppet_twitter_path_prefix }}" matrix_mx_puppet_twitter_server_url: '{{ matrix_homeserver_url }}{{ matrix_mx_puppet_twitter_server_path }}' -# "@user:server.com" to allow specific user +# "@user:example.com" to allow specific user # "@.*:example.com" to allow users on a specific homeserver # "@.*" to allow anyone matrix_mx_puppet_twitter_provisioning_whitelist: - "@.*:{{ matrix_domain | regex_escape }}" # Leave empty to disable blacklist -# "@user:server.com" disallow a specific user +# "@user:example.com" disallow a specific user # "@.*:example.com" disallow users on a specific homeserver matrix_mx_puppet_twitter_provisioning_blacklist: [] diff --git a/roles/custom/matrix-dendrite/defaults/main.yml b/roles/custom/matrix-dendrite/defaults/main.yml index 48aa21ada..e14d81a5f 100644 --- a/roles/custom/matrix-dendrite/defaults/main.yml +++ b/roles/custom/matrix-dendrite/defaults/main.yml @@ -321,7 +321,7 @@ matrix_dendrite_configuration_extension_yaml: | # server_notices: # system_mxid_localpart: notices # system_mxid_display_name: "Server Notices" - # system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ" + # system_mxid_avatar_url: "mxc://example.com/oumMVlgDnLYFaPVkExemNVVZ" # room_name: "Server Notices" matrix_dendrite_configuration_extension: "{{ matrix_dendrite_configuration_extension_yaml | from_yaml if matrix_dendrite_configuration_extension_yaml | from_yaml is mapping else {} }}" diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index e9cf89e7b..7e08a9331 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -1398,7 +1398,7 @@ matrix_synapse_configuration_extension_yaml: | # server_notices: # system_mxid_localpart: notices # system_mxid_display_name: "Server Notices" - # system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ" + # system_mxid_avatar_url: "mxc://example.com/oumMVlgDnLYFaPVkExemNVVZ" # room_name: "Server Notices" matrix_synapse_configuration_extension: "{{ matrix_synapse_configuration_extension_yaml | from_yaml if matrix_synapse_configuration_extension_yaml | from_yaml is mapping else {} }}" diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 index 3f7b8acd9..06c0f9143 100644 --- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -391,7 +391,7 @@ manhole_settings: # How to reach the server admin, used in ResourceLimitError # -#admin_contact: 'mailto:admin@server.com' +#admin_contact: 'mailto:admin@example.com' # Global blocking # @@ -2732,7 +2732,7 @@ stats: #server_notices: # system_mxid_localpart: notices # system_mxid_display_name: "Server Notices" -# system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ" +# system_mxid_avatar_url: "mxc://example.com/oumMVlgDnLYFaPVkExemNVVZ" # room_name: "Server Notices" From 6c4eeda748eea6102888cdc12166ad25521d20cf Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 02:51:32 +0900 Subject: [PATCH 23/37] Replace example.example.com with matrix.example.com Signed-off-by: Suguru Hirahara --- docs/configuring-well-known.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index 3bd8c5be3..3db8175d3 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -58,7 +58,7 @@ matrix_static_files_file_matrix_support_property_m_contacts: - email_address: security@example.com role: m.role.security -matrix_static_files_file_matrix_support_property_m_support_page: "https://example.example.com/support" +matrix_static_files_file_matrix_support_property_m_support_page: "https://matrix.example.com/support" ``` To learn how to set up `/.well-known/matrix/support` for the base domain, read the Installing section below. From e42e8aaf83ae7beccc0824b4112bdde3fb2d2fd4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:08:19 +0900 Subject: [PATCH 24/37] Replace with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-email.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-email.md b/docs/configuring-playbook-email.md index ab850e933..3e8caa991 100644 --- a/docs/configuring-playbook-email.md +++ b/docs/configuring-playbook-email.md @@ -5,7 +5,7 @@ By default, this playbook sets up an [Exim](https://www.exim.org/) email server The email server would attempt to deliver emails directly to their final destination. This may or may not work, depending on your domain configuration (SPF settings, etc.) -By default, emails are sent from `matrix@` (as specified by the `exim_relay_sender_address` playbook variable). +By default, emails are sent from `matrix@example.com` (as specified by the `exim_relay_sender_address` playbook variable). **Note**: If you are using a Google Cloud instance, [port 25 is always blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/), so you need to relay email through another SMTP server as described below. From 28c28e1e00dca526cc2ed26d2ae75dfef7f411fc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:10:02 +0900 Subject: [PATCH 25/37] Replace with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-well-known.md | 6 +++--- docs/howto-server-delegation.md | 2 +- docs/registering-users.md | 2 +- docs/updating-users-passwords.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index 3db8175d3..d078f2a19 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -191,8 +191,8 @@ Make sure to: No matter which method you've used to set up the well-known files, if you've done it correctly you should be able to see a JSON file at these URLs: -- `https:///.well-known/matrix/server` -- `https:///.well-known/matrix/client` -- `https:///.well-known/matrix/support` +- `https://example.com/.well-known/matrix/server` +- `https://example.com/.well-known/matrix/client` +- `https://example.com/.well-known/matrix/support` You can also check if everything is configured correctly, by [checking if services work](maintenance-checking-services.md). diff --git a/docs/howto-server-delegation.md b/docs/howto-server-delegation.md index d4386fb04..5644ff089 100644 --- a/docs/howto-server-delegation.md +++ b/docs/howto-server-delegation.md @@ -24,7 +24,7 @@ Server Delegation by means of a `/.well-known/matrix/server` file is the most st - you need to have a working HTTPS server for the base domain (`example.com`). If you don't have any server for the base domain at all, you can easily solve it by making the playbook [serve the base domain from the Matrix server](configuring-playbook-base-domain-serving.md). -- any downtime on the base domain (`example.com`) or network trouble between the matrix subdomain (`matrix.example.com`) and the base `` may cause Matrix Federation outages. As the [Server-Server spec says](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery): +- any downtime on the base domain (`example.com`) or network trouble between the matrix subdomain (`matrix.example.com`) and the base `example.com` may cause Matrix Federation outages. As the [Server-Server spec says](https://matrix.org/docs/spec/server_server/r0.1.0.html#server-discovery): > Errors are recommended to be cached for up to an hour, and servers are encouraged to exponentially back off for repeated failures. diff --git a/docs/registering-users.md b/docs/registering-users.md index d725e8486..75863e26b 100644 --- a/docs/registering-users.md +++ b/docs/registering-users.md @@ -36,7 +36,7 @@ ansible-playbook -i inventory/hosts setup.yml --extra-vars='username=` is just a plain username (like `john`), not your full `@:example.com` identifier. -**You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element./`. +**You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element.example.com/`. ----- diff --git a/docs/updating-users-passwords.md b/docs/updating-users-passwords.md index bfa74ce44..1785a67ca 100644 --- a/docs/updating-users-passwords.md +++ b/docs/updating-users-passwords.md @@ -10,7 +10,7 @@ ansible-playbook -i inventory/hosts setup.yml --extra-vars='username=` is just a plain username (like `john`), not your full `@:example.com` identifier. -**You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element./`. +**You can then log in with that user** via the Element service that this playbook has created for you at a URL like this: `https://element.example.com/`. ## Option 2 (if you are using an external Postgres server): From 5153c9a6c41fb35fa901f448d0bf2daec2929bcc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:10:53 +0900 Subject: [PATCH 26/37] Replace with example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bridge-appservice-webhooks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-bridge-appservice-webhooks.md b/docs/configuring-playbook-bridge-appservice-webhooks.md index d10f451b9..01debd2f3 100644 --- a/docs/configuring-playbook-bridge-appservice-webhooks.md +++ b/docs/configuring-playbook-bridge-appservice-webhooks.md @@ -10,7 +10,7 @@ Setup Instructions: loosely based on [this](https://github.com/turt2live/matrix-appservice-webhooks/blob/master/README.md) -1. All you basically need is to adjust your `inventory/host_vars/matrix./vars.yml`: +1. All you basically need is to adjust your `inventory/host_vars/matrix.example.com/vars.yml`: ```yaml matrix_appservice_webhooks_enabled: true @@ -18,7 +18,7 @@ matrix_appservice_webhooks_api_secret: '' ``` 2. In case you want to change the verbosity of logging via `journalctl -fu matrix-appservice-webhooks.service` -you can adjust this in `inventory/host_vars/matrix./vars.yml` as well. +you can adjust this in `inventory/host_vars/matrix.example.com/vars.yml` as well. **Note**: default value is: `info` and availabe log levels are : `info`, `verbose` From 7aab3a4f839c36bdbbe89a1a2d824a1cab5fbc6c Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:14:35 +0900 Subject: [PATCH 27/37] Replace with matrix.example.com Signed-off-by: Suguru Hirahara --- roles/custom/matrix-conduit/defaults/main.yml | 4 ++-- roles/custom/matrix-dendrite/defaults/main.yml | 4 ++-- roles/custom/matrix-synapse/defaults/main.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/custom/matrix-conduit/defaults/main.yml b/roles/custom/matrix-conduit/defaults/main.yml index 3e0132c29..f8f53ba33 100644 --- a/roles/custom/matrix-conduit/defaults/main.yml +++ b/roles/custom/matrix-conduit/defaults/main.yml @@ -112,9 +112,9 @@ matrix_conduit_container_extra_arguments: [] # Specifies which template files to use when configuring Conduit. # If you'd like to have your own different configuration, feel free to copy and paste -# the original files into your inventory (e.g. in `inventory/host_vars//`) +# the original files into your inventory (e.g. in `inventory/host_vars/matrix.example.com/`) # and then change the specific host's `vars.yaml` file like this: -# matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars//conduit.toml.j2" +# matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars/matrix.example.com/conduit.toml.j2" matrix_conduit_template_conduit_config: "{{ role_path }}/templates/conduit.toml.j2" # Max size for uploads, in bytes diff --git a/roles/custom/matrix-dendrite/defaults/main.yml b/roles/custom/matrix-dendrite/defaults/main.yml index e14d81a5f..fd6c50ed5 100644 --- a/roles/custom/matrix-dendrite/defaults/main.yml +++ b/roles/custom/matrix-dendrite/defaults/main.yml @@ -199,9 +199,9 @@ matrix_dendrite_systemd_service_post_start_delay_seconds: 3 # Specifies which template files to use when configuring Dendrite. # If you'd like to have your own different configuration, feel free to copy and paste -# the original files into your inventory (e.g. in `inventory/host_vars//`) +# the original files into your inventory (e.g. in `inventory/host_vars/matrix.example.com/`) # and then change the specific host's `vars.yml` file like this: -# matrix_dendrite_template_dendrite_config: "{{ playbook_dir }}/inventory/host_vars//dendrite.yaml.j2" +# matrix_dendrite_template_dendrite_config: "{{ playbook_dir }}/inventory/host_vars/matrix.example.com/dendrite.yaml.j2" matrix_dendrite_template_dendrite_config: "{{ role_path }}/templates/dendrite.yaml.j2" matrix_dendrite_client_api_registration_shared_secret: "" diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 7e08a9331..028a69a97 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -339,9 +339,9 @@ matrix_synapse_in_container_python_packages_path: "/usr/local/lib/python3.11/sit # Specifies which template files to use when configuring Synapse. # If you'd like to have your own different configuration, feel free to copy and paste -# the original files into your inventory (e.g. in `inventory/host_vars//`) +# the original files into your inventory (e.g. in `inventory/host_vars/matrix.example.com/`) # and then change the specific host's `vars.yml` file like this: -# matrix_synapse_template_synapse_homeserver: "{{ playbook_dir }}/inventory/host_vars//homeserver.yaml.j2" +# matrix_synapse_template_synapse_homeserver: "{{ playbook_dir }}/inventory/host_vars/matrix.example.com/homeserver.yaml.j2" matrix_synapse_template_synapse_homeserver: "{{ role_path }}/templates/synapse/homeserver.yaml.j2" matrix_synapse_template_synapse_log: "{{ role_path }}/templates/synapse/synapse.log.config.j2" From 951cdba49ba0e0bf1a24dddc0cf12bdf7559c6bc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:27:27 +0900 Subject: [PATCH 28/37] Replace with example.com Signed-off-by: Suguru Hirahara --- .../custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 index 06c0f9143..f5c293770 100644 --- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -1962,7 +1962,7 @@ saml2_config: # # idp_icon: An optional icon for this identity provider, which is presented # by clients and Synapse's own IdP picker page. If given, must be an -# MXC URI of the format mxc:///. (An easy way to +# MXC URI of the format mxc://example.com/. (An easy way to # obtain such an MXC URI is to upload an image to an (unencrypted) room # and then copy the "url" from the source of the event.) # From c73800b6bc101bb4a4856bffe508aea6ad6c5e8f Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 03:50:20 +0900 Subject: [PATCH 29/37] Replace matrix-example.com-media-store with matrix-example-media-store Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-s3.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-s3.md b/docs/configuring-playbook-s3.md index f29f1e3bd..fb7b51b10 100644 --- a/docs/configuring-playbook-s3.md +++ b/docs/configuring-playbook-s3.md @@ -75,11 +75,11 @@ You [can't easily change which region (US, Europe) your Backblaze account stores After logging in to Backblaze: -- create a new **private** bucket through its user interface (you can call it something like `matrix-example.com-media-store`) +- create a new **private** bucket through its user interface (you can call it something like `matrix-example-media-store`) - note the **Endpoint** for your bucket (something like `s3.us-west-002.backblazeb2.com`). - adjust its Lifecycle Rules to: Keep only the last version of the file - go to [App Keys](https://secure.backblaze.com/app_keys.htm) and use the **Add a New Application Key** to create a new one - - restrict it to the previously created bucket (e.g. `matrix-example.com-media-store`) + - restrict it to the previously created bucket (e.g. `matrix-example-media-store`) - give it *Read & Write* access The `keyID` value is your **Access Key** and `applicationKey` is your **Secret Key**. From b392b544dae4239d651fb5dd9d916b0eb5b2bac8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 22:58:28 +0900 Subject: [PATCH 30/37] Replace another.com with example.net Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-baibot.md | 2 +- docs/configuring-playbook-federation.md | 2 +- docs/configuring-playbook-synapse-simple-antispam.md | 2 +- roles/custom/matrix-bot-baibot/defaults/main.yml | 2 +- roles/custom/matrix-bot-chatgpt/defaults/main.yml | 2 +- roles/custom/matrix-bot-honoroit/defaults/main.yml | 2 +- roles/custom/matrix-bot-postmoogle/defaults/main.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/configuring-playbook-bot-baibot.md b/docs/configuring-playbook-bot-baibot.md index 5b3c5af4d..1c7aa419e 100644 --- a/docs/configuring-playbook-bot-baibot.md +++ b/docs/configuring-playbook-bot-baibot.md @@ -89,7 +89,7 @@ If `matrix_admin` is already configured in your `vars.yml` configuration, you ca # # matrix_bot_baibot_config_access_admin_patterns: # - "@*:example.com" -# - "@admin:another.com" +# - "@admin:example.net" # # .. unless you've made yourself an admin of all bots/bridges like this: # diff --git a/docs/configuring-playbook-federation.md b/docs/configuring-playbook-federation.md index 54ec6b4b0..e4bcee00f 100644 --- a/docs/configuring-playbook-federation.md +++ b/docs/configuring-playbook-federation.md @@ -11,7 +11,7 @@ To make your server only federate with servers of your choosing, add the followi ```yaml matrix_synapse_federation_domain_whitelist: - example.com -- another.com +- example.net ``` If you wish to disable federation, you can do that with an empty list (`[]`), or better yet by completely disabling federation (see below). diff --git a/docs/configuring-playbook-synapse-simple-antispam.md b/docs/configuring-playbook-synapse-simple-antispam.md index 4c13b987a..70b0f64cb 100644 --- a/docs/configuring-playbook-synapse-simple-antispam.md +++ b/docs/configuring-playbook-synapse-simple-antispam.md @@ -14,5 +14,5 @@ matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled: true matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers: - example.com -- another.com +- example.net ``` diff --git a/roles/custom/matrix-bot-baibot/defaults/main.yml b/roles/custom/matrix-bot-baibot/defaults/main.yml index faf4f10e6..21a576d08 100644 --- a/roles/custom/matrix-bot-baibot/defaults/main.yml +++ b/roles/custom/matrix-bot-baibot/defaults/main.yml @@ -93,7 +93,7 @@ matrix_bot_baibot_config_command_prefix: "!bai" # Example: # matrix_bot_baibot_config_access_admin_patterns: # - "@*:example.com" -# - "@admin:another.com" +# - "@admin:example.net" matrix_bot_baibot_config_access_admin_patterns: "{{ [matrix_admin] if matrix_admin else [] }}" # Controls the `persistence.data_dir_path` configuration setting. diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index aab8a5d90..ecb7da0f1 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -90,7 +90,7 @@ matrix_bot_chatgpt_matrix_rich_text: true # MATRIX_RICH_TEXT=true # - @someone:example.com # - @another:example.com # - @bot.*:example.com -# - @*:another.com +# - @*:example.net # matrix_bot_chatgpt_admins: "{{ [matrix_admin] if matrix_admin else [] }}" # Additional environment variables to pass to the chatgpt container diff --git a/roles/custom/matrix-bot-honoroit/defaults/main.yml b/roles/custom/matrix-bot-honoroit/defaults/main.yml index 1ac81eadc..5a1279bdc 100644 --- a/roles/custom/matrix-bot-honoroit/defaults/main.yml +++ b/roles/custom/matrix-bot-honoroit/defaults/main.yml @@ -168,7 +168,7 @@ matrix_bot_honoroit_redmine_done_status_id: '' # done status ID (e.g. 3) # - @someone:example.com # - @another:example.com # - @bot.*:example.com -# - @*:another.com +# - @*:example.net matrix_bot_honoroit_allowedusers: - "@*:*" diff --git a/roles/custom/matrix-bot-postmoogle/defaults/main.yml b/roles/custom/matrix-bot-postmoogle/defaults/main.yml index 7cf8f94b5..e30148b6c 100644 --- a/roles/custom/matrix-bot-postmoogle/defaults/main.yml +++ b/roles/custom/matrix-bot-postmoogle/defaults/main.yml @@ -103,7 +103,7 @@ matrix_bot_postmoogle_relay_password: '' # - '@someone:example.com' # - '@another:example.com' # - '@bot.*:example.com' -# - '@*:another.com' +# - '@*:example.net' matrix_bot_postmoogle_admins: "{{ [matrix_admin] if matrix_admin else [] }}" # Sentry DSN. Deprecated, use matrix_bot_postmoogle_monitoring_sentry_dsn From 54f7dd587a0d2c5483817c49332e81aee5b22124 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 01:46:28 +0900 Subject: [PATCH 31/37] Replace second-example.com and third-example.com with example.net and example.org, respectively Signed-off-by: Suguru Hirahara --- roles/custom/matrix-bot-chatgpt/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index ecb7da0f1..8dba39b13 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -73,7 +73,7 @@ matrix_bot_chatgpt_matrix_default_prefix_reply: false # MATRIX_DEFAULT_PREFIX_R # Matrix Access Control (optional) # # Lists of space-separated entries. Example: -# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :second-example.com :third-example.com" +# matrix_bot_chatgpt_matrix_whitelist: ":{{ matrix_domain }} :example.net :example.org" matrix_bot_chatgpt_matrix_blacklist: '' matrix_bot_chatgpt_matrix_whitelist: ':{{ matrix_domain }}' From 4a375be6a899bd408f3e0840a6ca1cb6c164a1e9 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 12:15:53 +0900 Subject: [PATCH 32/37] Replace matrix.domain with matrix.example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-bot-postmoogle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-bot-postmoogle.md b/docs/configuring-playbook-bot-postmoogle.md index 4af99aba9..537db9b07 100644 --- a/docs/configuring-playbook-bot-postmoogle.md +++ b/docs/configuring-playbook-bot-postmoogle.md @@ -71,7 +71,7 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-use To use the bot, invite the `@postmoogle:example.com` bot user into a room you want to use as a mailbox. -Then send `!pm mailbox NAME` to expose this Matrix room as an inbox with the email address `NAME@matrix.domain`. Emails sent to that email address will be forwarded to the room. +Then send `!pm mailbox NAME` to expose this Matrix room as an inbox with the email address `NAME@matrix.example.com`. Emails sent to that email address will be forwarded to the room. Send `!pm help` to the room to see the bot's help menu for additional commands. From 309b91163ac9024309132b80b664a288661a3895 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 16:14:19 +0900 Subject: [PATCH 33/37] Update docs/configuring-playbook-email.md: fix default email sender specified by exim_relay_sender_address exim_relay_sender_address consists of exim_relay_hostname, which by default is equal to matrix_server_fqn_matrix, whose default value is matrix.example.com Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-email.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-email.md b/docs/configuring-playbook-email.md index 3e8caa991..d0a18da15 100644 --- a/docs/configuring-playbook-email.md +++ b/docs/configuring-playbook-email.md @@ -5,7 +5,7 @@ By default, this playbook sets up an [Exim](https://www.exim.org/) email server The email server would attempt to deliver emails directly to their final destination. This may or may not work, depending on your domain configuration (SPF settings, etc.) -By default, emails are sent from `matrix@example.com` (as specified by the `exim_relay_sender_address` playbook variable). +By default, emails are sent from `matrix@matrix.example.com`, as specified by the `exim_relay_sender_address` playbook variable. **Note**: If you are using a Google Cloud instance, [port 25 is always blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/), so you need to relay email through another SMTP server as described below. From 2b102851e20795b3f1ccddf9f35e12be16e96e0f Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 16:22:10 +0900 Subject: [PATCH 34/37] Update docs/configuring-playbook-traefik.md: use a different hostname Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-traefik.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-traefik.md b/docs/configuring-playbook-traefik.md index aeab79dbf..f98875aa6 100644 --- a/docs/configuring-playbook-traefik.md +++ b/docs/configuring-playbook-traefik.md @@ -57,9 +57,9 @@ However, if your service does not run on a container or runs on another machine, ## Reverse-proxying a remote HTTP/HTTPS service behind Traefik -If you want to host another webserver would be reachable via `my-fancy-website.example.com` from the internet and via `https://:` from inside your network, you can make the playbook's integrated Traefik instance reverse-proxy the traffic to the correct host. +If you want to host another webserver would be reachable via `my-fancy-website.example.net` from the internet and via `https://:` from inside your network, you can make the playbook's integrated Traefik instance reverse-proxy the traffic to the correct host. -Prerequisites: DNS and routing for the domain `my-fancy-website.example.com` need to be set up correctly. In this case, you'd be pointing the domain name to your Matrix server - `my-fancy-website.example.com` would be a CNAME going to `matrix.example.com`. +Prerequisites: DNS and routing for the domain `my-fancy-website.example.net` need to be set up correctly. In this case, you'd be pointing the domain name to your Matrix server - `my-fancy-website.example.net` would be a CNAME going to `matrix.example.com`. First, we have to adjust the static configuration of Traefik, so that we can add additional configuration files: From d997ac6e341d5d8a9374f18461391824b5161190 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 16:23:31 +0900 Subject: [PATCH 35/37] Update docs/configuring-playbook-traefik.md: fix the incorrect hostname Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-traefik.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuring-playbook-traefik.md b/docs/configuring-playbook-traefik.md index f98875aa6..de860cef8 100644 --- a/docs/configuring-playbook-traefik.md +++ b/docs/configuring-playbook-traefik.md @@ -99,7 +99,7 @@ aux_file_definitions: http: routers: webserver-router: - rule: Host(`my_fancy_website.example.com`) + rule: Host(`my-fancy-website.example.net`) service: webserver-service tls: certResolver: default @@ -122,7 +122,7 @@ aux_file_definitions: tcp: routers: webserver-router: - rule: Host(`my_fancy_website.example.com`) + rule: Host(`my-fancy-website.example.net`) service: webserver-service tls: passthrough: true From 26503464c6fb3dd33aa0f6d9da366013a6256693 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 16:36:25 +0900 Subject: [PATCH 36/37] Update examples/vars.yml: update a comment to sync with roles/custom/matrix-base/defaults/main.yml Signed-off-by: Suguru Hirahara --- examples/vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vars.yml b/examples/vars.yml index b8be5f7a3..b6f20c277 100644 --- a/examples/vars.yml +++ b/examples/vars.yml @@ -3,7 +3,7 @@ # Matrix user ids for your server will be of the form (`@user:example.com`). # # Note: this playbook does not touch the server referenced here. -# Installation happens on another server ("matrix.example.com"). +# Installation happens on another server ("matrix.example.com", see `matrix_server_fqn_matrix`). # # If you've deployed using the wrong domain, you'll have to run the Uninstalling step, # because you can't change the Domain after deployment. From 49f7fd96c9b61d4cedc167f2e5c3d44159b18b2e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 18 Oct 2024 17:00:54 +0900 Subject: [PATCH 37/37] Fix docs/configuring-well-known.md and add a comment Signed-off-by: Suguru Hirahara --- docs/configuring-well-known.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md index d078f2a19..a1f889e6b 100644 --- a/docs/configuring-well-known.md +++ b/docs/configuring-well-known.md @@ -58,7 +58,8 @@ matrix_static_files_file_matrix_support_property_m_contacts: - email_address: security@example.com role: m.role.security -matrix_static_files_file_matrix_support_property_m_support_page: "https://matrix.example.com/support" +# Your organization's support page on the base (or another) domain, if any +matrix_static_files_file_matrix_support_property_m_support_page: "https://example.com/support" ``` To learn how to set up `/.well-known/matrix/support` for the base domain, read the Installing section below.