Commit Graph

4170 Commits

Author SHA1 Message Date
894669eca2 Change back to working original mx-puppet-slack
Now that v0.1.1 is out, which depends on the functional matrix-slack-parser
it works again.
2022-05-14 21:09:54 +02:00
b5a0839507 Merge pull request #1823 from etkecc/patch-7
Update Cinny v2.0.1 -> v2.0.2
2022-05-14 14:11:31 +02:00
dca593cf7a Update Cinny v2.0.1 -> v2.0.2 2022-05-14 11:33:19 +00:00
45f8810a00 Merge pull request #1822 from etkecc/patch-6
Update Cinny v2.0.0 -> v2.0.1
2022-05-13 18:59:27 +02:00
8ec1f4bee0 Update Cinny v2.0.0 -> v2.0.1 2022-05-13 16:20:04 +00:00
d76194acf6 Merge pull request #1821 from luismanson/patch-3
Update configuring-playbook-bridge-hookshot.md
2022-05-13 17:01:50 +02:00
1431a351ab Update configuring-playbook-bridge-hookshot.md
fix Hookshot instructions link
2022-05-13 11:57:59 -03:00
fb8af6c678 Merge pull request #1820 from brush/master
Suggested fix to docs for reverse proxy for well-known file
2022-05-13 13:00:40 +02:00
3499b9cd03 Update configuring-well-known.md 2022-05-13 03:45:08 -07:00
34de6c9c66 Update configuring-well-known.md 2022-05-13 03:44:16 -07:00
eb7bed5221 Merge pull request #1816 from OdyX/appservice-slack-1-11-update
Bump Slack Appservice to 1.11.0
2022-05-11 11:04:48 +02:00
eda75e6492 Bump Slack Appservice to 1.11.0 2022-05-11 10:47:00 +02:00
47f7fbcd36 Merge pull request #1814 from etkecc/master
matrix-bot-buscarron v1.1.0
2022-05-10 17:59:38 +02:00
d09934c79c matrix-bot-buscarron - set defaults 2022-05-10 18:44:20 +03:00
9997ca4dbd Merge branch 'spantaleev:master' into master 2022-05-10 15:39:34 +00:00
8c505e8a2c matrix-bot-buscarron v1.1.0 2022-05-10 18:38:57 +03:00
255001af0e Merge pull request #1813 from HarHarLinks/patch-13
Update configuring-playbook-bridge-hookshot.md
2022-05-10 17:06:08 +02:00
3dfda42f3d Update configuring-playbook-bridge-hookshot.md 2022-05-10 16:50:46 +02:00
764571c6fb Merge pull request #1812 from etkecc/patch-5
Update Element 1.10.11 -> 1.10.12
2022-05-10 16:42:36 +02:00
02d4a841c4 Update Element 1.10.11 -> 1.10.12 2022-05-10 14:31:41 +00:00
c27b4aa4ae Merge pull request #1811 from etkecc/patch-5
Update cinny v1.8.2 -> v2.0.0
2022-05-10 16:09:07 +02:00
62cb801878 Update cinny v1.8.2 -> v2.0.0 2022-05-10 13:57:12 +00:00
9fc60d8c86 Revert "Change back to original mx-puppet-slack"
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
2022-05-10 16:20:44 +03:00
6184ed2d8c Merge pull request #1809 from dsonck92/change-to-upstream
Change back to original mx-puppet-slack
2022-05-10 07:25:35 +02:00
fcfd00bcb4 Change back to original mx-puppet-slack
Closes: #1808
2022-05-09 23:38:01 +02:00
5ad8547c14 Merge pull request #1806 from Arkonos/master
Clarify reverse-proxying of well-known files with Caddy2
2022-05-09 10:32:29 +02:00
527f5bc469 clarifying where well-known files are created 2022-05-08 21:56:14 +02:00
76bfe9a0ea Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:38:35 +02:00
ef3b352eec Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:37:56 +02:00
c01693395f Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:34:10 +02:00
6abdb6e6f0 clarifying reverse proxying of well-known files 2022-05-08 21:33:46 +02:00
04aa609ae5 clarifying reverse proxying of well-known files 2022-05-08 21:20:36 +02:00
25302ed142 Merge pull request #1802 from dsonck92/change-to-upstream
Change back to original mx-puppet-discord
2022-05-08 07:35:11 +02:00
e62123ac13 Merge pull request #1804 from HarHarLinks/feeds
Add hookshot feeds config support
2022-05-08 07:10:40 +02:00
7390646cd5 add hookshot feeds support 2022-05-07 18:42:15 +02:00
0d0f771b02 Merge pull request #1803 from HarHarLinks/patch-12
Upgrade Hookshot (1.5.0 -> 1.6.1)
2022-05-07 15:54:24 +02:00
84ea5f6ecc Upgrade Hookshot (1.5.0 -> 1.6.1) 2022-05-07 14:34:33 +02:00
3f45805fd2 Change back to original mx-puppet-discord
Closes: #1801
2022-05-07 12:40:17 +02:00
83b7fcee45 Do not proxy some endpoints to the generic Synapse worker
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
2022-05-07 09:39:19 +02:00
21d8327c48 Merge pull request #1800 from ptman/patch-1
typo
2022-05-06 13:53:40 +03:00
be95918a2f typo 2022-05-06 11:37:40 +03:00
058fedff91 Fix "endpoint seems conditional" determination in workers-doc-to-yaml.awk"
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
02632b3504ad4512c5f5a4f859b3fe326b19c788.
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.
2022-05-06 09:08:45 +02:00
549e4418b9 Upgrade Synapse (1.58.0 -> 1.58.1) 2022-05-06 08:56:06 +02:00
1439be2743 Upgrade matrix-appservice-irc (0.33 -> 0.34)
Related to https://matrix.org/blog/2022/05/04/0-34-0-security-release-for-matrix-appservice-irc-high-severity
2022-05-04 11:10:00 +03:00
03674e1a36 Upgrade Synapse (1.57.1 -> 1.58.0) 2022-05-03 14:32:32 +03:00
7adc167412 Fail if trying to use Jitsi on an architecture other than amd64
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1797
2022-05-03 08:10:18 +03:00
a7c230233c Merge pull request #1795 from kraftbj/patch-1
Upgrade to Grafana 8.5.1
2022-05-02 21:19:41 +03:00
7776c2e0bb 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/
2022-05-02 12:37:56 -05:00
d2941b56b2 Merge pull request #1790 from etkecc/patch-5
matrix-change-user-admin-status: do not allocate tty
2022-04-26 21:13:30 +03:00
1ee118bd49 matrix-change-user-admin-status: do not allocate tty 2022-04-26 17:48:28 +00:00