pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3378 commits 2 branches 0 tags 16 MiB
Commit graph

3378 commits

This branch
This branch
All branches
Author SHA1 Message Date
Slavi Pantaleev 272888d917
Merge pull request #462 from cnvandijk/feature-dimension-unfederated 
Add support for running dimension in an unfederated environment
 2020-04-22 22:47:14 +03:00
Slavi Pantaleev 0af5a8c4cc Simplify mx-puppet-skype blacklists a bit 
Related to #466 (Github Pull Request).
 2020-04-22 22:42:24 +03:00
Slavi Pantaleev 7ab4b4b151
Merge pull request #466 from Jozian/allow-more-options-skype-relay-provisioning 
Allow skype more configurations for relay and provisioning
 2020-04-22 22:41:12 +03:00
Rodrigo Belem b08a49d94d Allow skype more configurations for relay and provisioning 2020-04-22 15:26:31 -04:00
Chris van Dijk 3f4bc9b881 Move config supprt for unfederated dimension into group_vars 2020-04-22 19:23:56 +02:00
Slavi Pantaleev 9991d545dd Add note about synapse-janitor and require explicit confirmation for usage 
Fixes #465 (Github Issue).

Related to https://github.com/xwiki-labs/synapse_scripts/pull/12.
 2020-04-21 21:48:06 +03:00
Slavi Pantaleev 554da8338a
Merge pull request #463 from hooger/architecture 
Architecture
 2020-04-20 16:45:59 +03:00
Marcel Partap 46984a4f99 Nginx conf: more testing less b0rk 2020-04-19 21:42:34 +02:00
Christoph Johannes Kleine 765c046beb
add missing ; to matrix-synapse.conf.j2 2020-04-19 19:50:42 +02:00
Marcel Partap 5f63d287b7 Move synapse worker ports up 10k 2020-04-19 19:05:03 +02:00
Marcel Partap e4763c21bc nginx config: route traffic to workers on matrix-synapse 
FIXME: horrid duplication in template file
 2020-04-19 19:05:03 +02:00
Marcel Partap 66a4073512 Publish synapse worker ports, need to be accessible to nginx 2020-04-19 19:05:03 +02:00
Marcel Partap cf452fdf0a Fix corner-cases found through testing (aka ansible is nuts) 2020-04-19 19:05:03 +02:00
Marcel Partap a14b9c09ad Add to synapse nginx template conditional URL rewrites for workers 
· 😅 How to keep this in sync with the matrix-synapse documentation?
· regex location matching is expensive
· nginx syntax limit: one location only per block / statement
· thus, lots of duplicate statements in this file
 2020-04-19 19:05:03 +02:00
Marcel Partap 353bc7c362 Add initial support for synapse workers 
· needs documentation; no checks yet for port clashes or typos in worker name
· according to https://github.com/matrix-org/synapse/wiki/Workers-setup-with-nginx#results
  about 90% of requests go to the synchrotron endpoint
· thus, the synchrotron worker is especially suited to be load-balanced
· most of the other workers are documented to support only a single instance
· https://github.com/matrix-org/synapse/blob/master/docs/workers.md
 2020-04-19 19:05:03 +02:00
Slavi Pantaleev f8ada98c19
Merge pull request #464 from thedanbob/nginx-1.17.10 
Update nginx (1.17.9 -> 1.17.10)
 2020-04-19 16:55:58 +03:00
Dan Arnfield e2de6a1569 Update nginx (1.17.9 -> 1.17.10) 2020-04-19 08:38:53 -05:00
Horvath Gergely 588e97a97c link to self-building from implementation subsection 2020-04-19 14:02:32 +02:00
Horvath Gergely 441278412b add explicit information for the Rapsberry pi 2020-04-19 13:51:26 +02:00
Horvath Gergely 7dba695713 clarification for the list of implementation details 2020-04-19 13:32:27 +02:00
Horvath Gergely b5844d2395 shortening line based on @spantaleev 's comment 2020-04-19 13:31:36 +02:00
Horvath Gergely bd61598faf add experimental(?) architecture support for arm32 and arm64 
the changes are necessary because certbot images are tagged, so docker does not recognize the necessary architecture
 2020-04-18 22:55:19 +02:00
Chris van Dijk 18beb30466 Update docs to reflect support for unfederated dimension 2020-04-18 19:12:20 +02:00
Chris van Dijk da2e90dcc1 Remove check for "Fail if Matrix Federation is disabled" 
This playbook now suports running dimension in both a federated and an
unfederated environment.
 2020-04-18 19:01:45 +02:00
Chris van Dijk 3ddb8cd148 Add support for running dimension in an unfederated environment 
This config change follows:

  https://github.com/turt2live/matrix-dimension/blob/master/docs/unfederated.md
 2020-04-18 19:00:20 +02:00
Horvath Gergely 203a319881 force build docker image if git master changes 2020-04-18 12:56:36 +02:00
Slavi Pantaleev c13c29f48e Fix |to_nice_yaml breaking formatting 
Well, actually 8cd9cde won't work, unless we put the
`|to_nice_yaml` thing on a new line.

We can, but that takes more lines and makes things look uglier.
Using `|to_json` seems good enough.

The whole file is parsed as YAML later on and merged with the
`_extension` variable before being dumped as YAML again in the end.
 2020-04-18 11:06:53 +03:00
Slavi Pantaleev 8cd9cdead0 Improve consistency 2020-04-18 11:05:47 +03:00
Slavi Pantaleev 27cae3d90c
Merge pull request #461 from lampholder/toml/allowed_local_3pids 
Expose allowed local 3pids as a configurable option
 2020-04-18 11:05:01 +03:00
Tom e54428b160 Expose allowed local 3pids as a configurable option 2020-04-18 00:11:30 +01:00
Slavi Pantaleev 43201c9e22 Upgrade matrix-corporal (1.8.0 -> 1.9.0) 2020-04-17 22:26:55 +03:00
Slavi Pantaleev 9a43cc02e0 Only install docker-python if matrix_docker_installation_enabled 
Should help with #300 (Github Issue).
 2020-04-17 09:45:35 +03:00
Slavi Pantaleev 4d260c0dd5 Add encryption configuration defaults to Mautrix bridges 
Related to #451 (Github Issue).
 2020-04-17 09:44:48 +03:00
Slavi Pantaleev ba6ff19a94
Merge pull request #460 from cnvandijk/fix-hardcoded-postgres-template-values 
Fix hardcoded postgres template values
 2020-04-17 08:20:40 +03:00
Chris van Dijk 88c1fbf6aa Fix hardcoded values in postgres script matrix-change-user-admin-status 2020-04-17 00:54:38 +02:00
Chris van Dijk d83236ea0e Fix inconsistent whitespace 2020-04-17 00:53:26 +02:00
Slavi Pantaleev df3353a6f5
Merge pull request #459 from Jozian/new-mx-puppet-skype-port 
Upstream set mx-puppet-skype default port to 8438
 2020-04-16 10:46:51 +03:00
Rodrigo Belem cc8fc55ac6 Upstream set mx-puppet-skype default port to 8438 2020-04-15 15:13:56 -04:00
Slavi Pantaleev 4b42c1ec68
Merge pull request #455 from daudo/fix_channel_id_bridge_appservice_slack 
matrix-appservice-slack: improved documentation
 2020-04-14 10:41:22 +03:00
Udo Rader b6aa246f7c better described how to get channel id, added a section how to unlink a channel and a troubleshooting section 2020-04-13 17:17:19 +02:00
Udo Rader cf36dbe4f6 correctly quoted <channel id> and added another way to retrieve it 2020-04-13 11:22:13 +02:00
Slavi Pantaleev 11968126d0
Merge pull request #452 from jgoerzen/patch-1 
Fix to avoid putting an incorrect empty jitsi.preferredDomain when no…
 2020-04-12 01:09:35 +03:00
Slavi Pantaleev 69338d045a
Simplify if conditions 2020-04-12 01:09:22 +03:00
John Goerzen ddc44996e3
Fix to avoid putting an incorrect empty jitsi.preferredDomain when no local jitsi 2020-04-11 17:07:30 -05:00
Slavi Pantaleev 515160f0d7 Fix STUN server URL for jitsi/web (turns -> stun) 
Discussed in #446 (Github Pull Request).
 2020-04-09 19:09:04 +03:00
Slavi Pantaleev 181434d9c6 Add matrix-mx-puppet-skype to the list of roles that can self-build 2020-04-09 18:50:32 +03:00
Slavi Pantaleev b9a72310bd
Merge pull request #448 from Jozian/skype-fix-self-build-var 
Add global var to control skype image self build
 2020-04-09 18:19:28 +03:00
Rodrigo Belem 64de103dff Add global var to control skype image self build 2020-04-09 11:03:06 -04:00
Slavi Pantaleev 2f601a4aee
Merge pull request #446 from skoal/master 
Jitsi related firewall and port changes
 2020-04-09 16:14:06 +03:00
Slavi Pantaleev e6ebfbf8cc Prevent conflict between Whatsapp and Skype bridge tokens 
Fixes an error like this:

> synapse.config._base.ConfigError: Cannot reuse as_token across application services
 2020-04-09 16:07:36 +03:00