Commit graph

1288 commits

Author SHA1 Message Date
Slavi Pantaleev 2b6c263900
Merge pull request #376 from thedanbob/nginx-1.17.8
Update nginx (1.17.7 -> 1.17.8)
2020-02-12 13:58:19 +01:00
Slavi Pantaleev 594742ef58
Merge pull request #375 from thedanbob/synapse-1.10.0
Update synapse (1.9.1 -> 1.10.0)
2020-02-12 13:58:00 +01:00
Dan Arnfield bb08022623 Update certbot (1.0.0 -> 1.2.0) 2020-02-12 06:56:25 -06:00
Dan Arnfield 74235df820 Update nginx (1.17.7 -> 1.17.8) 2020-02-12 06:52:11 -06:00
Dan Arnfield bac7685ce4 Update synapse (1.9.1 -> 1.10.0) 2020-02-12 06:46:52 -06:00
Horvath Gergely 8a0c3146d3 Merge branch 'master' of https://github.com/spantaleev/matrix-docker-ansible-deploy 2020-02-11 20:56:54 +01:00
Slavi Pantaleev 5421ce22bf
Merge pull request #374 from dhoffend/additional-configuration-blocks
matrix-nginx-proxy: adding additional configuration blocks
2020-02-11 10:06:04 +01:00
Daniel Hoffend b280b05c25 matrix-nginx-proxy: adding additional configuration blocks 2020-02-10 23:42:41 +01:00
Slavi Pantaleev 1e18a84f8b Merge pull request #371 from teutat3s/fix_appservice_slack_salt
fix slack bridge: salt too large, sha512_crypt requires <= 16 chars
2020-02-10 09:41:57 +01:00
teutates 2c4eef72c3
fix slack bridge: salt too large, sha512_crypt requires <= 16 chars 2020-02-10 02:47:26 +01:00
Slavi Pantaleev db63f784ae
Merge pull request #370 from verb/appservice-irc-nedb
Fix matrix-appservice-irc database specification
2020-02-08 21:46:59 +01:00
Lee Verberne 8fe8cf9113 Fix matrix-appservice-irc database specification
This fixes an incorrect indentation in the database specification for
appservice-irc which caused matrix-appservice-irc to refuse to start
with the remarkably unhelpful error message:

```
ERROR:CLI Failed to run bridge.
```

This also updates doc links to the new matrixdotorg repo because the
tedomum repo contains out-of-date documentation.
2020-02-08 11:02:03 +01:00
Slavi Pantaleev 500b292c14
Merge pull request #368 from joao-p-marques/fix-slack-password-hash
fix invalid password salt on slack bridge
2020-02-06 10:14:04 +01:00
joao-p-marques a0b313b3d1 fix invalid password salt on slack bridge 2020-02-06 00:25:26 +00:00
Slavi Pantaleev f18037ae42 Disable TLSv1.1 by default 2020-01-30 12:56:20 +02:00
Slavi Pantaleev f9a67624e1 Upgrade Synapse (1.9.0 -> 1.9.1) 2020-01-28 16:02:09 +02:00
Slavi Pantaleev b323c975cf Upgrade riot-web (1.5.7 -> 1.5.8) 2020-01-28 13:01:30 +02:00
Slavi Pantaleev c9f2bf89b5 Fix incorrect REST Auth module URL
Regression since #362 (Github Pull Request).
2020-01-27 12:22:40 +02:00
Slavi Pantaleev 38d4c555d0
Merge pull request #362 from spantaleev/ma1uta-rest-auth-password-provider
Switch from kamax-matrix/matrix-synapse-rest-password-provider to ma1uta/matrix-synapse-rest-password-provider
2020-01-26 23:18:39 +02:00
Slavi Pantaleev 0696845f3f
Merge pull request #361 from spantaleev/official-matrix-appservice-irc
Switch to upgraded & official matrix-appservice-irc Docker image
2020-01-26 23:18:04 +02:00
Slavi Pantaleev 019433acc2
Merge pull request #364 from aaronraimist/patch-5
Link to official instructions on how to install Ansible
2020-01-26 23:13:36 +02:00
Slavi Pantaleev 874d2390dd Revert "Upgrade Slack bridge to 1.0.2"
This reverts commit 61e93744ec.

Reverting because of:
- https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/341
- https://github.com/matrix-org/matrix-appservice-slack/issues/347
2020-01-26 23:07:12 +02:00
Aaron Raimist d77df2990a
Link to official instructions on how to install Ansible 2020-01-26 14:17:59 -06:00
Slavi Pantaleev c2135d1afe Switch from kamax-matrix/matrix-synapse-rest-password-provider to ma1uta/matrix-synapse-rest-password-provider
Synapse v1.9.0 changed some things which made the REST Auth Password
Provider break.

The ma1uta/matrix-synapse-rest-password-provider implements some
workarounds for now and will likely deliver a proper fix in the future.

Not much has changed between the 2 projects, so this should be a
painless transition.
2020-01-25 10:23:59 +02:00
Slavi Pantaleev aa05df6a02 Switch to upgraded & official matrix-appservice-irc Docker image 2020-01-25 10:07:08 +02:00
Slavi Pantaleev 77b919aec6 Become compatible with official matrix-appservice-irc Docker image
This change allows us to work with both our existing Docker image
(`tedomum/matrix-appservice-irc:latest`) and with the
official Docker image (`matrixdotorg/matrix-appservice-irc`).

The actual change to the official Docker image requires more testing
and will be done separately.
2020-01-25 10:05:47 +02:00
Slavi Pantaleev 848068e62a
Merge pull request #359 from dhose/patch/fix-if-case
Fix for when if case evaluates to false
2020-01-24 23:57:59 +02:00
dhose 320d512541 Fix for when if case evaluates to false 2020-01-24 19:46:58 +01:00
Slavi Pantaleev 6e3dae5ec0
Merge pull request #358 from thedanbob/python3-docker-fix
Install python3-docker if ansible is running python 3
2020-01-24 18:45:25 +02:00
Slavi Pantaleev 35f84d0c28
Merge pull request #357 from zekesonxx/patch-1
Fix invalid password salts for slack webhooks
2020-01-24 18:43:23 +02:00
Dan Arnfield bc620895ca Install python3-docker if ansible is running python 3 2020-01-24 06:59:42 -06:00
Zach Mertes e0defd4d4c
Fix invalid password salts for slack webhooks 2020-01-24 05:06:36 -05:00
Slavi Pantaleev 2c04384e8e Synchronize config with the one from Synapse 1.9.0
Related to #355.
2020-01-23 15:47:53 +02:00
Slavi Pantaleev e162cce220
Merge pull request #355 from ptman/patch-1
Upgrade Synapse to 1.9.0
2020-01-23 15:47:19 +02:00
Paul Tötterman e9761679eb
Upgrade Synapse to 1.9.0 2020-01-23 15:46:24 +02:00
Slavi Pantaleev 704d2ff861
Merge pull request #351 from prasket/matrix-change-user-admin-status
Matrix change user admin status
2020-01-23 10:35:28 +02:00
Slavi Pantaleev 6c784b88cd
Merge pull request #354 from thedanbob/uri-follow-redirects-fix
uri.follow_redirects is now a string field
2020-01-23 10:34:37 +02:00
Dan Arnfield 86eff45e8b uri.follow_redirects is now a string field 2020-01-22 15:36:54 -06:00
prasket 72cef6fa90 Merge branch 'matrix-change-user-admin-status' of github.com:prasket/matrix-docker-ansible-deploy into matrix-change-user-admin-status 2020-01-21 18:31:49 -08:00
prasket 83e7a8d9e6 corrected hardcoded matrix domain and added code to remove old matrix-make-user-admin script per suggestion. 2020-01-21 18:29:17 -08:00
Slavi Pantaleev 8d38ff65db
Merge pull request #352 from aaronraimist/patch-4
Use Postgres 12.1 when creating a backup
2020-01-21 11:07:52 +02:00
Aaron Raimist 65963f694a
Use Postgres 12.1 when creating a backup 2020-01-20 16:33:47 -06:00
Slavi Pantaleev 9d3d538a2d Use C collation for Postgres to appease Synapse 2020-01-21 00:13:47 +02:00
prasket 069375cac5
Merge branch 'master' into matrix-change-user-admin-status 2020-01-20 13:17:35 -08:00
prasket 80dd5f0b46 reversing another accident, forgot vim mode wasnt enabled at the time 2020-01-20 13:05:46 -08:00
Slavi Pantaleev f9d21befdf
Merge pull request #350 from aaronraimist/patch-2
Reword updating-users-passwords.md option 3
2020-01-20 23:03:06 +02:00
prasket a23455b697 accidentaly removed a : 2020-01-20 13:02:02 -08:00
prasket 92c6031c9f changes to the docs for the new admin modifcation scripts 2020-01-20 12:59:36 -08:00
Aaron Raimist 121994f562
Reword updating-users-passwords.md option 3 2020-01-20 12:09:01 -06:00
prasket 20b0e5d2c8 Merge branch 'matrix-change-user-admin-status' of github.com:prasket/matrix-docker-ansible-deploy into matrix-change-user-admin-status 2020-01-19 18:40:13 -08:00