This reverts commit fcfd00bcb4.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1808

Reverts https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1809

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1810

Change back to original mx-puppet-slack

Closes: #1808

Clarify reverse-proxying of well-known files with Caddy2

Change back to original mx-puppet-discord

Add hookshot feeds config support

Upgrade Hookshot (1.5.0 -> 1.6.1)

Closes: #1801

These endpoints should not be proxied to a generic Synapse worker
without other preparation (setting up stream writers, sending traffic
to a specific stream writer, etc.).

Disabling them for now. In the future, we'd like to fix up our awk
script to disable them automatically.

This is a fix up for 058fedff91

typo

This prevented us from keeping our workers reverse-proxying definitions
updated since Synapse v1.54.0.

The last `workers.md` file we could parse is at commit
02632b3504.
Parsing regressed at commit c56bfb08bc071368db23f3b1c593724eb4f205f0,
because the introduction message for `synapse.app.generic_worker` said
"If":

> If a worker is set up to handle a..

.. which made the AWK script think that definitions below were
conditional (which they're not in this case).

This patch fixes up the regex for determining if a line is conditional
or not, so that it doesn't trip up. Hopefully, it doesn't miss something
important.

Related to https://matrix.org/blog/2022/05/04/0-34-0-security-release-for-matrix-appservice-irc-high-severity

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1797

Upgrade to Grafana 8.5.1

https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-5-1/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-5-0/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-7/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-6/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-5/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-4/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-3/
https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-4-2/

matrix-change-user-admin-status: do not allocate tty

Update element 1.10.10 -> 1.10.11

Support ansible vault strings for homeserver secret key

matrix-bot-buscarron: fix username in docs

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1782

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1782

add matrix-bot-buscarron

Make synapse htpasswd file path configurable

.. regardless of whether matrix-nginx-proxy runs in a container or not

Don't self-build signald image on arm64, as upstream image exists

Update path to signald Dockerfile

When setting `matrix_nginx_proxy_enabled: false` and enabling authentication on the metrics endpoint, the htpasswd file is hardcoded to the nginx-proxy container dir, this changes the hardcoded value to a variable so the path can be updated