Commit Graph

7717 Commits

Author SHA1 Message Date
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
prasket
e99497bb60 created new file with change admin options and removed make admin file. Updated name references as well throughout the project. 2020-01-19 18:39:56 -08:00
prasket
776c108392 created new file with change admin options and removed make admin file. Updated name references as well throughout the project. 2020-01-19 18:35:57 -08:00
Slavi Pantaleev
b8eb5e4e0d Add a note for users not using SSH keys 2020-01-18 19:55:26 +02:00
Slavi Pantaleev
72f6e56fb8 Upgrade mautrix-telegram (0.6.1 -> 0.7.0) 2020-01-18 14:17:50 +02:00
Slavi Pantaleev
6576dc820a
Merge pull request #343 from lxp/fix-registration-regex
Fix regex in matrix_appservice_webhooks_registration_yaml
2020-01-16 09:47:03 +02:00
David Gnedt
73d0bf7170 Fix regex in matrix_appservice_webhooks_registration_yaml 2020-01-15 19:17:05 +01:00
Slavi Pantaleev
4840214193 Announce Appservice Webhooks support
Related to #339 (Github Pull Request).
2020-01-14 16:02:37 +02:00
Slavi Pantaleev
0ffe821cfb Fix some minor Markdown rendering issues 2020-01-14 15:55:56 +02:00
Slavi Pantaleev
219663f02e
Merge pull request #339 from netresearch/master
Add matrix-appservice-webhooks role.
2020-01-14 15:18:52 +02:00
Horvath Gergely
83e5cd7d6f Merge branch 'master' of https://github.com/spantaleev/matrix-docker-ansible-deploy 2020-01-13 19:38:55 +01:00
Björn Marten
f9d518796b Correct regex in matrix_appservice_webhooks_registration_yaml 2020-01-13 17:30:39 +01:00
Björn Marten
80e4eb9ab7 Remove file logging completely 2020-01-13 17:30:19 +01:00
Björn Marten
268e1d0c80 Remove appearance section in matrix_appservice_webhooks_configuration_yaml due to not being used 2020-01-13 17:30:01 +01:00
Björn Marten
208d5d0fda Adjust log level choices to verbose and info 2020-01-13 17:29:46 +01:00
Björn Marten
a8476c1b8e Mention that the bridge itself expects its own domain and not '/appservice-webhooks' 2020-01-13 17:29:19 +01:00
Björn Marten
cb57cd503e Fix documentation mistakes caused due to carelessness 2020-01-13 17:28:54 +01:00
Björn Marten
c6e066595b Add matrix-appservice-webhooks to configurable services in README.md 2020-01-13 17:20:50 +01:00
Björn Marten
c2696e8fa7 Add appservice-webhooks configuration documentation 2020-01-13 17:20:50 +01:00
Björn Marten
654d45a2bf Adjust message when webhook bridge is activated but nginx-proxy is not 2020-01-13 17:20:50 +01:00
Björn Marten
6b2bf2c38b Get rid of rewrite terminology 2020-01-13 17:20:50 +01:00
Björn Marten
3a80616185 Change logging behaviour to only stdout with configurable verbosity (default: info) 2020-01-13 17:20:49 +01:00