Commit graph

3241 commits

Author SHA1 Message Date
Slavi Pantaleev 811a46ad07
Merge pull request #205 from kingoftheconnors/master
Add Slack bridging support
2019-08-21 07:43:07 +03:00
Slavi Pantaleev 65da600426
Merge branch 'master' into master 2019-08-21 07:34:20 +03:00
Slavi Pantaleev 63d1ed1d56 Update changelog and documentation 2019-08-21 07:24:58 +03:00
Slavi Pantaleev c8a4d59a81
Merge pull request #251 from Munfred/master
Add mautrix-hangouts bridge role and documentation
2019-08-21 07:15:14 +03:00
Slavi Pantaleev 2ef8898421
Add comment 2019-08-21 07:14:31 +03:00
Slavi Pantaleev 97fb71d98c
Change privilege level 2019-08-21 07:12:46 +03:00
Slavi Pantaleev 1bcbc4a9ba Update matrix-corporal (1.4.0 -> 1.5.0) 2019-08-20 11:20:26 +03:00
Slavi Pantaleev e4b67fdb6b
Fix typo 2019-08-20 09:07:54 +03:00
Slavi Pantaleev 4c9105eeec
Fix typo 2019-08-20 09:06:54 +03:00
Slavi Pantaleev 2efcf11ee8
Remove some whitespace 2019-08-20 09:06:14 +03:00
Eduardo Beltrame 53ae84f627
Add documentation on mautrix-hangouts bridge 2019-08-19 23:00:05 -07:00
Eduardo Beltrame 88aef08af2
Add description of mautrix hangouts bridge in readme 2019-08-19 22:36:16 -07:00
Slavi Pantaleev 885338c4fb
Merge pull request #249 from Munfred/master
Describe setting up SMTP server with Sendgrid
2019-08-19 18:58:57 +03:00
Slavi Pantaleev c464ab303c
Merge pull request #250 from thedanbob/updates
Update synapse (1.3.0 -> 1.3.1) and riot-web (1.3.2 -> 1.3.3)
2019-08-19 18:58:05 +03:00
Dan Arnfield 1ce3526bf2 Update riot-web (1.3.2 -> 1.3.3) 2019-08-19 06:46:11 -05:00
Dan Arnfield 42ea3cb0e1 Update synapse (1.3.0 -> 1.3.1) 2019-08-19 06:45:51 -05:00
Eduardo Beltrame ecff0f4a67
Describe setting up SMTP server with Sendgrid 2019-08-18 19:55:54 -07:00
Slavi Pantaleev db57618abd Update nginx and certbot 2019-08-17 10:21:23 +03:00
Slavi Pantaleev fcd96b5dee Add missing options to ProxyPass 2019-08-17 10:14:40 +03:00
Slavi Pantaleev 3cb34e6998 Improve Synapse reverse-proxying Apache examples
Thanks to @ralfi!
2019-08-17 10:13:45 +03:00
Slavi Pantaleev e22672911d Add Server-Server API proxying to Apache example configuration
Contributed by @ralfi.
2019-08-16 10:08:09 +03:00
Slavi Pantaleev fe3f523853
Merge pull request #245 from dreamflasher/patch-1
missing Map /.well-known/matrix/server for server discovery
2019-08-16 10:00:43 +03:00
Slavi Pantaleev d675cb3d4b
Serve /.well-known/matrix/server with proper Content-Type 2019-08-16 10:00:26 +03:00
Slavi Pantaleev 1b2191a0f1 Add new Synapse configuration options (since 1.3.0)
Continuation of #246 (Github Pull Request)
2019-08-16 09:57:51 +03:00
Slavi Pantaleev c5c1216f31
Merge pull request #246 from thedanbob/synapse-1.3.0
Update synapse (1.2.1 -> 1.3.0)
2019-08-15 15:45:11 +03:00
Dan Arnfield 7b5e633776 Update synapse (1.2.1 -> 1.3.0) 2019-08-15 06:59:37 -05:00
Slavi Pantaleev a1afafeb35 Upgrade mxisd (1.4.5 -> 1.4.6) 2019-08-15 09:36:04 +03:00
Marcel Ackermann d55db2bee2
quotes, simplify 2019-08-14 08:49:06 +02:00
Marcel Ackermann 18a2377472
missing Map /.well-known/matrix/server for server discovery 2019-08-13 20:40:04 +02:00
kingoftheconnors 63cf891842 Improved documentation 2019-08-13 10:54:58 -04:00
Slavi Pantaleev 59d807fca7 Ensure auth.clientID is passed as string in Discord configuration
Discord client IDs are numeric (e.g. 12345).
Passing them as integers however, causes the Discord bridge's YAML parser
to parse them as integers and its config schema validation will fail.

Fixes #240 (Github Issue)
2019-08-11 16:16:05 +03:00
Slavi Pantaleev 0646d4b3ec
Merge pull request #239 from thedanbob/postgres-11.5-10.10-9.6.15
Bump postgres versions (11.5, 10.10, 9.6.15)
2019-08-09 15:08:20 +03:00
Dan Arnfield dc11704c11 Bump postgres versions (11.5, 10.10, 9.6.15) 2019-08-09 06:03:26 -05:00
Slavi Pantaleev c2c0481d90 Mention Email2Matrix usage alongside Postfix 2019-08-09 12:15:44 +03:00
Slavi Pantaleev 910ffb481c Update email2matrix (1.0 -> 1.0.1) 2019-08-09 12:10:53 +03:00
Slavi Pantaleev 99f5baa7bb Fix undefined variable error (matrix_synapse_id_servers_public)
This only gets triggered if:
- the Synapse role is used standalone and the default values are used
- the whole playbook is used, with `matrix_mxisd_enabled: false`
2019-08-08 18:30:54 +03:00
Slavi Pantaleev 5b736c416b
Merge pull request #236 from oleg-fiksel/guest-access
Added possibility to enable guest access on synapse
2019-08-08 13:18:55 +03:00
Oleg Fiksel 43628ddad6 Added "|to_json" to ensure we really pass a boolean 2019-08-08 12:11:19 +02:00
Oleg Fiksel f713bbe0f8 Added possibility to enable guest access on synapse 2019-08-08 11:57:35 +02:00
Slavi Pantaleev 3e57a1463a Serve nginx status page over HTTPS as well
Continuation of #234 (Github Pull Request).

I had unintentionally updated the documentation for the feature,
saying the page is available at `https://matrix.DOMAIN/nginx_status`.

Looks like it wasn't the case, going against my expectations.

I'm correcting this with this patch.
The status page is being made available on both HTTP and HTTPS.
Serving over HTTP is likely necessary for services like
Longview
(https://www.linode.com/docs/platform/longview/longview-app-for-nginx/)
2019-08-07 12:53:53 +03:00
Slavi Pantaleev 4abca27df7
Merge pull request #234 from ugs9fsy71cb/master
Serve nginx_status to matrix.DOMAIN
2019-08-07 12:36:03 +03:00
Slavi Pantaleev f97175a1c6
Update configuring-playbook-ngnix.md 2019-08-07 12:35:48 +03:00
p5t2vspoqqw c32a3e3204 correct defaults 2019-08-07 10:56:29 +02:00
p5t2vspoqqw 4b8190dc3f serve status page for matrix.DOMAIN only 2019-08-07 10:54:14 +02:00
p5t2vspoqqw 281f2ee519 Merge branch 'master' of https://github.com/spantaleev/matrix-docker-ansible-deploy 2019-08-07 09:30:24 +02:00
Slavi Pantaleev 949009f254
Merge pull request #233 from thedanbob/riot-web-1.3.2
Update riot-web (1.3.0 -> 1.3.2)
2019-08-06 15:07:19 +03:00
Dan Arnfield dc71457132 Update riot-web (1.3.0 -> 1.3.2) 2019-08-06 06:36:14 -05:00
microchipster 122c3f1ec0 sync more chats in hangouts, switch to admin mode 2019-08-06 05:27:40 +00:00
microchipster 1e8d593f7a fix hangout displayname bug 2019-08-06 05:27:40 +00:00
microchipster 75785a0734 fix login url 2019-08-06 05:27:40 +00:00