Commit graph

4378 commits

Author SHA1 Message Date
Julian-Samuel Gebühr 8ecdfc3ed6
Automatically enable admin api access via nginx (#1830) 2022-05-16 10:26:15 +03:00
Slavi Pantaleev 99931af532
Merge pull request #1825 from dsonck92/change-to-upstream
Change back to working original mx-puppet-slack
2022-05-16 07:39:00 +02:00
Slavi Pantaleev 3e90dc445a
Merge pull request #1828 from aaronraimist/element-self-build
Update Element self build repo URL
2022-05-16 07:36:57 +02:00
Slavi Pantaleev d286c60cdb
Merge pull request #1827 from aaronraimist/git-prereq
Document `git` as a potential prereq
2022-05-16 07:36:41 +02:00
Aaron Raimist 311f44a19c
Document git as a potential prereq
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1792
2022-05-16 04:36:18 +00:00
Aaron Raimist 2a9b52a1c2
Update Element self build repo URL
It forwards to the correct place but might as well just update it to the current URL.
2022-05-16 04:29:29 +00:00
Slavi Pantaleev 637073c72b
Merge pull request #1826 from etkecc/patch-8
Update Cinny v2.0.2 -> v2.0.3
2022-05-15 08:32:46 +02:00
Aine c58c7dc643
Update Cinny v2.0.2 -> v2.0.3 2022-05-15 05:45:07 +00:00
Daniel Sonck 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
Slavi Pantaleev 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
Aine dca593cf7a
Update Cinny v2.0.1 -> v2.0.2 2022-05-14 11:33:19 +00:00
Slavi Pantaleev 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
Aine 8ec1f4bee0
Update Cinny v2.0.0 -> v2.0.1 2022-05-13 16:20:04 +00:00
Slavi Pantaleev d76194acf6
Merge pull request #1821 from luismanson/patch-3
Update configuring-playbook-bridge-hookshot.md
2022-05-13 17:01:50 +02:00
Luis 1431a351ab
Update configuring-playbook-bridge-hookshot.md
fix Hookshot instructions link
2022-05-13 11:57:59 -03:00
Slavi Pantaleev 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
brush 3499b9cd03
Update configuring-well-known.md 2022-05-13 03:45:08 -07:00
brush 34de6c9c66
Update configuring-well-known.md 2022-05-13 03:44:16 -07:00
Slavi Pantaleev 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
Didier 'OdyX' Raboud eda75e6492
Bump Slack Appservice to 1.11.0 2022-05-11 10:47:00 +02:00
Slavi Pantaleev 47f7fbcd36
Merge pull request #1814 from etkecc/master
matrix-bot-buscarron v1.1.0
2022-05-10 17:59:38 +02:00
Aine d09934c79c
matrix-bot-buscarron - set defaults 2022-05-10 18:44:20 +03:00
Aine 9997ca4dbd
Merge branch 'spantaleev:master' into master 2022-05-10 15:39:34 +00:00
Aine 8c505e8a2c
matrix-bot-buscarron v1.1.0 2022-05-10 18:38:57 +03:00
Slavi Pantaleev 255001af0e
Merge pull request #1813 from HarHarLinks/patch-13
Update configuring-playbook-bridge-hookshot.md
2022-05-10 17:06:08 +02:00
Kim Brose 3dfda42f3d
Update configuring-playbook-bridge-hookshot.md 2022-05-10 16:50:46 +02:00
Slavi Pantaleev 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
Aine 02d4a841c4
Update Element 1.10.11 -> 1.10.12 2022-05-10 14:31:41 +00:00
Slavi Pantaleev 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
Aine 62cb801878
Update cinny v1.8.2 -> v2.0.0 2022-05-10 13:57:12 +00:00
Slavi Pantaleev 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
Slavi Pantaleev 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
Daniel Sonck fcfd00bcb4 Change back to original mx-puppet-slack
Closes: #1808
2022-05-09 23:38:01 +02:00
Slavi Pantaleev 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
Arkonos 527f5bc469 clarifying where well-known files are created 2022-05-08 21:56:14 +02:00
Arkonos 76bfe9a0ea Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:38:35 +02:00
Arkonos ef3b352eec Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:37:56 +02:00
Arkonos c01693395f Merge branch 'master' of https://github.com/Arkonos/matrix-docker-ansible-deploy 2022-05-08 21:34:10 +02:00
Arkonos 6abdb6e6f0 clarifying reverse proxying of well-known files 2022-05-08 21:33:46 +02:00
Arkonos 04aa609ae5 clarifying reverse proxying of well-known files 2022-05-08 21:20:36 +02:00
Slavi Pantaleev 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
Slavi Pantaleev e62123ac13
Merge pull request #1804 from HarHarLinks/feeds
Add hookshot feeds config support
2022-05-08 07:10:40 +02:00
HarHarLinks 7390646cd5 add hookshot feeds support 2022-05-07 18:42:15 +02:00
Slavi Pantaleev 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
Kim Brose 84ea5f6ecc
Upgrade Hookshot (1.5.0 -> 1.6.1) 2022-05-07 14:34:33 +02:00
Daniel Sonck 3f45805fd2 Change back to original mx-puppet-discord
Closes: #1801
2022-05-07 12:40:17 +02:00
Slavi Pantaleev 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
Slavi Pantaleev 21d8327c48
Merge pull request #1800 from ptman/patch-1
typo
2022-05-06 13:53:40 +03:00
Paul Tötterman be95918a2f
typo 2022-05-06 11:37:40 +03:00
Slavi Pantaleev 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