Slavi Pantaleev
13c4e7e5b6
Merge branch 'master' into separate-bridge-roles
2019-05-16 09:45:06 +09:00
Slavi Pantaleev
ae7c8d1524
Use SyslogIdentifier to improve logging
...
Reasoning is the same as for matrix-org/synapse#5023 .
For us, the journal used to contain `docker` for all services, which
is not very helpful when looking at them all together (`journalctl -f`).
2019-05-16 09:43:46 +09:00
Slavi Pantaleev
cf3117011b
Upgrade Synapse (0.99.3.2 -> 0.99.4)
2019-05-16 09:20:43 +09:00
Slavi Pantaleev
6db10ed6f3
Upgrade riot-web (1.1.1 -> 1.1.2)
2019-05-16 09:09:42 +09:00
Slavi Pantaleev
3339e37ce9
Move matrix-appservice-irc into a separate role
2019-05-16 09:07:40 +09:00
Slavi Pantaleev
854cf84aa3
Upgrade riot-web (1.1.0 -> 1.1.1)
2019-05-15 09:50:25 +09:00
Slavi Pantaleev
47745254f9
Merge pull request #180 from eMPee584/fix-commented-mxisd-ldap-option
...
Fix case of the mxisd ldap.connection.baseDNs option in matrix_mxisd_configuration_extension_yaml comment
2019-05-15 09:49:34 +09:00
Slavi Pantaleev
43c53aaab6
Merge pull request #182 from eMPee584/better-rest-auth-sample-endpoint
...
Provide a sample rest_auth_endpoint close to actual setup
2019-05-15 09:48:37 +09:00
Slavi Pantaleev
7179316c35
Merge pull request #181 from eMPee584/fix-synapse-ldap-start_tls-boolean
...
Fix matrix_synapse_ext_password_provider_ldap_start_tls (it's boolean)
2019-05-15 09:37:01 +09:00
Slavi Pantaleev
43fd3cc274
Move mautrix-facebook into a separate role
2019-05-15 09:34:31 +09:00
Marcel Partap
66388c1f5b
Provide a sample rest_auth_endpoint close to actual setup
2019-05-15 01:51:02 +02:00
Marcel Partap
5aa7f637d8
Fix matrix_synapse_ext_password_provider_ldap_start_tls (it's boolean)
2019-05-14 23:09:59 +02:00
Marcel Partap
25d3b315de
Fix case of the mxisd ldap.connection.baseDNs option in comment
2019-05-14 22:38:21 +02:00
Slavi Pantaleev
bb816df557
Move mautrix telegram and whatsapp into separate roles
...
The goal is to move each bridge into its own separate role.
This commit starts off the work on this with 2 bridges:
- mautrix-telegram
- mautrix-whatsapp
Each bridge's role (including these 2) is meant to:
- depend only on the matrix-base role
- integrate nicely with the matrix-synapse role (if available)
- integrate nicely with the matrix-nginx-proxy role (if available and if
required). mautrix-telegram bridge benefits from integrating with
it.
- not break if matrix-synapse or matrix-nginx-proxy are not used at all
This has been provoked by #174 (Github Issue).
2019-05-14 23:47:22 +09:00
Slavi Pantaleev
83e250936b
Merge pull request #178 from eMPee584/add-service-stop
...
Add a task to stop services (and remove containers)
2019-05-14 19:00:47 +09:00
Marcel Partap
d114736014
Add a task to stop services (and remove containers)
2019-05-14 11:46:07 +02:00
Slavi Pantaleev
873c291be6
Fix appservice-discord configuration-extension merging
2019-05-14 08:24:03 +09:00
Slavi Pantaleev
953ae021ba
Upgrade mxisd (1.4.2 -> 1.4.3)
2019-05-14 08:22:10 +09:00
Slavi Pantaleev
e05d6e1a44
Merge pull request #177 from aaronraimist/reset-passwords-2
...
Move around options on updating-users-passwords.md
2019-05-12 11:44:42 +09:00
Aaron Raimist
2d1fbdb51d
Move around options on updating-users-passwords.md
...
and provide an example for using the admin API
2019-05-11 21:39:31 -05:00
Slavi Pantaleev
db39bfc2f5
Merge pull request #175 from aaronraimist/patch-2
...
Mention the Synapse User Admin API on updating-users-passwords.md
2019-05-12 11:02:51 +09:00
Aaron Raimist
59e05672d0
Convert registering-users.md to use ``` syntax for code blocks
...
The bit about the matrix-make-user-admin script was messed up (it wasn't actually a code block so the "<username>" was hidden). For me at least it seems like the ``` syntax is much harder to accidentally mess up.
2019-05-10 15:38:22 -05:00
Aaron Raimist
12b7cccbc6
Mention the Synapse User Admin API on updating-users-passwords.md
2019-05-10 15:33:15 -05:00
Slavi Pantaleev
e48eccfa82
Merge pull request #173 from danbob/update-postgres
...
Bump postgres versions
2019-05-10 16:26:24 +03:00
Dan Arnfield
6163ba5bb1
Bump postgres versions
2019-05-10 08:02:32 -05:00
Slavi Pantaleev
417877fe91
Merge pull request #172 from inthewaves/riot-web-v1.1.0
...
Bump riot-web version (1.0.8->1.1.0)
2019-05-10 09:53:12 +03:00
inthewaves
51e408bc94
Bump riot-web version (1.0.8->1.1.0)
2019-05-10 05:57:28 +00:00
Slavi Pantaleev
3898072028
Merge pull request #170 from babolivier/babolivier/fix-caddy-example
...
Fix matrix-synapse example for Caddy
2019-05-09 16:11:40 +03:00
Brendan Abolivier
cdac997ddb
Improve comments for Caddy's TLS instructions
2019-05-09 13:22:23 +01:00
Brendan Abolivier
e067db613c
Fix exception to proxying
2019-05-09 13:20:26 +01:00
Slavi Pantaleev
9d14e2dcb1
Fix broken link in changelog
2019-05-09 10:31:22 +03:00
Slavi Pantaleev
c669ea1b79
Update changelog
2019-05-09 10:30:08 +03:00
Slavi Pantaleev
2dd8d07ac9
Add docs about using other S3-compatible object stores
2019-05-09 10:28:01 +03:00
Slavi Pantaleev
216cdf8c74
Merge pull request #166 from izissise/mautrix-facebook
...
Mautrix facebook
2019-05-09 10:05:14 +03:00
Slavi Pantaleev
d91cff3f7a
Add docs about integrating mxisd's Registration feature
...
Docs for #161 (Github issue) and #168 (Github Pull Request).
2019-05-09 09:55:03 +03:00
Slavi Pantaleev
565236a49c
Merge pull request #168 from danbob/nginx-proxy-3pid-registration
...
Add option to proxy 3pid registration endpoints
2019-05-09 09:53:47 +03:00
Slavi Pantaleev
d97e820c89
Merge pull request #167 from danbob/synapse-3pid-options
...
Add registrations_require_3pid synapse option
2019-05-09 09:27:16 +03:00
Slavi Pantaleev
ccb33369a7
Merge pull request #169 from verb/federation-tester
...
Update URL for Matrix federation tester
2019-05-09 09:22:10 +03:00
Lee Verberne
8b5c1b0bd5
Update URL for Matrix federation tester
...
The previous URL returns a 404.
2019-05-09 07:04:46 +02:00
Dan Arnfield
171c6db41e
Add option to proxy 3pid registration endpoints
2019-05-08 13:49:51 -05:00
Dan Arnfield
958ad68078
Add registrations_require_3pid synapse option
2019-05-08 12:29:18 -05:00
Hugues Morisset
d4372d5ba8
Add mautrix-facebook doc
2019-05-08 17:11:07 +02:00
Hugues Morisset
a82d5ed281
Add tulir mautrix-facebook ( https://github.com/tulir/mautrix-facebook )
2019-05-08 17:11:07 +02:00
Slavi Pantaleev
5f2f17cb1e
Merge pull request #160 from danbob/fix-matrix-mxisd-config
...
Fix template indentation
2019-05-08 08:01:00 +03:00
Slavi Pantaleev
105364f548
Merge pull request #153 from huguesdk/bugfix/whitespace_in_templates
...
Fix whitespace in templates
2019-05-08 07:58:40 +03:00
Hugues De Keyzer
c451025134
Fix indentation in templates
...
Use Jinja2 lstrip_blocks option in templates to ensure consistent
indentation in generated files.
2019-05-07 21:23:35 +02:00
Dan Arnfield
3abed49764
Fix jinja config for indented code blocks
2019-05-07 06:02:38 -05:00
Dan Arnfield
07e7d518d5
Revert "Fix template indentation"
...
This reverts commit 172d59ba05
.
2019-05-07 05:57:20 -05:00
Slavi Pantaleev
0e7310fd7c
Merge pull request #164 from TheLastProject/fix/string_before_to_json
...
string before to_json when string value is expected
2019-05-07 10:41:41 +03:00
Sylvia van Os
9ea593df37
Fix incorrect casts
2019-05-07 09:35:51 +02:00