Cleanup after merge

docs/configuring-playbook-bridge-mautrix-wsproxy.md

@@ -26,4 +26,5 @@ This is the recommended way of setting up Double Puppeting, as it's easier to ac
 
 ## Usage
 
-Follow the [matrix-imessage documenation](https://docs.mau.fi/bridges/go/imessage/index.html) for running `matrix-imessage` on your iOS/MacOS device.
+Follow the [matrix-imessage documenation](https://docs.mau.fi/bridges/go/imessage/index.html) for running `android-sms` or `matrix-imessage` on your device.
+The name of the bridge bot is androidsms, but the bridge works for either iMessage or Android SMS, though not both at the same time.

docs/maintenance-postgres.md

@@ -80,10 +80,6 @@ This playbook can upgrade your existing Postgres setup with the following comman
 
 	ansible-playbook -i inventory/hosts setup.yml --tags=upgrade-postgres
 
-**Warning: If you're using Borg Backup keep in mind that there is no official Postgres 15 support yet.**
-As long as Alpine Linux is missing packages for postgres15, it is possible to use the `latest` or `14` image of borgmatic. Edit your `vars.yml` and add:
-`matrix_backup_borg_version: "latest"`
-
 **The old Postgres data directory is backed up** automatically, by renaming it to `/matrix/postgres/data-auto-upgrade-backup`.
 To rename to a different path, pass some extra flags to the command above, like this: `--extra-vars="postgres_auto_upgrade_backup_data_path=/another/disk/matrix-postgres-before-upgrade"`
 

group_vars/matrix_servers

@@ -705,7 +705,7 @@ matrix_mautrix_whatsapp_database_password: "{{ '%s' | format(matrix_homeserver_g
 
 ######################################################################
 #
-# matrix-bridge-mautrix-discord
+# matrix-bridge-mautrix-wsproxy
 #
 ######################################################################
 
@@ -741,7 +741,7 @@ matrix_mautrix_wsproxy_login_shared_secret: "{{ matrix_synapse_ext_password_prov
 
 ######################################################################
 #
-# matrix-bridge-mautrix-wsproxy
+# matrix-bridge-mautrix-discord
 #
 ######################################################################
 matrix_mautrix_discord_enabled: false

roles/custom/matrix-ntfy/defaults/main.yml

@@ -7,7 +7,7 @@ matrix_ntfy_base_path: "{{ matrix_base_data_path }}/ntfy"
 matrix_ntfy_config_dir_path: "{{ matrix_ntfy_base_path }}/config"
 matrix_ntfy_data_path: "{{ matrix_ntfy_base_path }}/data"
 
-matrix_ntfy_version: v1.29.0
+matrix_ntfy_version: v1.28.0
 matrix_ntfy_docker_image: "{{ matrix_container_global_registry_prefix }}binwiederhier/ntfy:{{ matrix_ntfy_version }}"
 matrix_ntfy_docker_image_force_pull: "{{ matrix_ntfy_docker_image.endswith(':latest') }}"