finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,152 Commits 3 Branches 0 Tags 171 MiB
862a6276a0
Commit Graph

2152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
skoal
0713570e2f
Update matrix_servers 
turn tls port update
 2020-04-09 14:40:32 +02:00
skoal
ab58b3fc9e
Update prerequisites.md 
Added Jitsi firewall ports
 2020-04-09 14:31:42 +02:00
Slavi Pantaleev
7035af87d8 Add support for Jitsi discovery for Riot via /.well-known/matrix/client 
This will not work yet, as no version of Riot currently supports it.
It's expected to land in riot-web v1.5.16 via matrix-org/matrix-react-sdk#4348.
 2020-04-09 09:58:35 +03:00
Slavi Pantaleev
c1a66d3422 Put mx-puppet-skype configs in ./config directory, not ./data 2020-04-09 09:44:10 +03:00
Slavi Pantaleev
5b8f8bc942 Announce Skype bridging 2020-04-09 09:33:30 +03:00
Slavi Pantaleev
4e9976d559 Rename documentation file 2020-04-09 09:26:03 +03:00
Slavi Pantaleev
59d05ad72c
Merge pull request #441 from Jozian/skype 
Initial mx-puppet-skype bridge role
 2020-04-09 09:24:11 +03:00
Slavi Pantaleev
67a5ef97ba Fix missing "stun:" prefix for jitsi/web STUN server URLs 
Hopefully fixes an error like this (which I haven't been able to
reproduce, but..):

> [modules/xmpp/strophe.util.js] <Object.i.Strophe.log>:  Strophe: Error: Failed to construct 'RTCPeerConnection': 'matrix.DOMAIN' is not one of the supported URL schemes 'stun', 'turn' or 'turns'.
 2020-04-09 09:16:10 +03:00
Rodrigo Belem
53f893b77e Add documentations for the mx-puppet-skype bridge 2020-04-08 19:25:21 -04:00
Rodrigo Belem
1107207147 Initial mx-puppet-skype bridge role 2020-04-08 19:25:21 -04:00
Slavi Pantaleev
61fffa169c Use Jitsi STUN servers instead of Google ones 
These are some new defaults that we switch to, to follow upstream
changes:

- https://github.com/jitsi/docker-jitsi-meet/commit/264df04
- 3121494d4b
 2020-04-08 19:08:15 +03:00
Slavi Pantaleev
e290b1be95 Merge branch 'jitsi_security_update' 2020-04-08 16:57:14 +03:00
Slavi Pantaleev
25d51d3de3 Fix typo 2020-04-08 16:46:41 +03:00
Slavi Pantaleev
5a8068d8d1
Merge pull request #444 from teutat3s/jitsi_security_update 
Jitsi security update
 2020-04-08 16:22:22 +03:00
Slavi Pantaleev
14786071af Pass JVB_AUTH_PASSWORD environment variable to make JVB startup happy 
We define this password in the `sip-communicator.properties`
configuration file, so this is not needed for actually running JVB.

However, it does a (useless) safety check during container startup,
and we need to make that check happy.
 2020-04-08 10:23:51 +03:00
Slavi Pantaleev
dcce276b86 Rename script file 2020-04-08 10:05:43 +03:00
Slavi Pantaleev
1b27e0f812 Make generate-jitsi-passwords.sh less magical 2020-04-08 10:05:10 +03:00
Slavi Pantaleev
e36fe54974 Merge branch 'jitsi_security_update' of github.com:teutat3s/matrix-docker-ansible-deploy into jitsi_security_update 2020-04-08 09:55:51 +03:00
Slavi Pantaleev
b181f02680
Use dollar sign instead of backtick 
Co-Authored-By: Sandro <sandro.jaeckel@gmail.com>
 2020-04-08 09:55:44 +03:00
Slavi Pantaleev
976ccf3880 Fix typo 2020-04-08 09:39:38 +03:00
Slavi Pantaleev
f798605836 Undefine Jitsi secrets and require their (re-)definition 2020-04-08 09:37:54 +03:00
teutat3s
6a9eb89ea6
fix whitespace 2020-04-08 02:07:52 +02:00
teutat3s
f9d39f1c0c
update Jitsi, add generate-jitsi-passwords script 2020-04-08 02:07:52 +02:00
Slavi Pantaleev
fab1e23609 Make a few more Jitsi Meet options configurable 2020-04-06 21:35:49 +03:00
Slavi Pantaleev
417e2c6493
Merge pull request #440 from hooger/facebook-self-build 
Facebook self build
 2020-04-06 20:48:36 +03:00
Horvath Gergely
17e7bae2cc make selfbuild be forced on (and only) git master change 2020-04-06 18:42:15 +02:00