iucca
ae122466fc
updated whatsapp config
2021-11-15 19:23:28 +01:00
Slavi Pantaleev
e72ae8bc48
Upgrade matrix-corporal (2.1.3 -> 2.1.4)
2021-11-15 17:23:25 +02:00
Slavi Pantaleev
c1bc7b9f93
Rename variables to prevent confusion
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1397
and https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1399
2021-11-15 14:56:11 +02:00
Slavi Pantaleev
ba48aa70f7
Fix variable name typo
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1397
2021-11-15 14:52:08 +02:00
Slavi Pantaleev
dc4452ac21
Merge branch 'master' into matrix-federation-api-port
2021-11-15 14:49:03 +02:00
Slavi Pantaleev
edf63bfdd7
Add some to_json invocations
2021-11-15 14:48:25 +02:00
Slavi Pantaleev
994c0e504c
Ensure some matrix-nginx-proxy variables are defined
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1397
2021-11-15 14:46:44 +02:00
Slavi Pantaleev
0152ecef1c
Merge pull request #1397 from borisrunakov/synapse_container_federation_port
...
Synapse container federation port
2021-11-15 14:45:34 +02:00
boris runakov
8c3e25de1b
renamed var to matrix_synapse_container_federation_api_port
2021-11-15 13:01:22 +02:00
boris runakov
28d9c3192e
Merge branch 'master' into matrix-federation-api-port
2021-11-15 12:49:47 +02:00
b
07496069c8
rellocating variables for consistency
2021-11-15 12:07:54 +02:00
Slavi Pantaleev
0d4764a213
Upgrade matrix-corporal (2.1.2 -> 2.1.3)
...
2.1.3 fixes a security vulnerability, which allowed attackers to
circuimvent policy checks by sending HTTP requests with trailing slashes.
Learn more in the matrix-corporal changelog: https://github.com/devture/matrix-corporal/blob/master/CHANGELOG.md
2021-11-15 11:24:12 +02:00
Slavi Pantaleev
c08880d175
Upgrade postgres-backup to v14
2021-11-15 09:15:44 +02:00
Slavi Pantaleev
10523b700c
Merge pull request #1396 from aaronraimist/postgres
...
Postgres Minor Updates (14.1, 13.5, 12.9, 11.14, 10.19)
2021-11-15 08:35:26 +02:00
Slavi Pantaleev
8abe1ac483
Warn people if on an old SQLite-supporting mautrix-facebook version
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1401
https://github.com/mautrix/facebook/releases/tag/v0.3.2 says that this
version re-adds SQLite support.
2021-11-15 08:28:20 +02:00
Arthur Brugière
708a7108b3
Upgrade Mautrix Facebook bridge version
2021-11-15 10:29:13 +07:00
iucca
4ff8fddd72
updated whatsapp config, backfill doesn't work
2021-11-14 23:57:52 +01:00
iucca
1d0e594def
updated whatsapp config, backfill doesn't work
2021-11-14 23:45:07 +01:00
b
afccc2b11f
make 8448 configurable instead of hard coded
2021-11-14 23:32:25 +02:00
Aaron Raimist
61b743f86d
Postgres Minor Updates (14.1, 13.5, 12.9, 11.14, 10.19)
2021-11-14 19:10:56 +00:00
b
5e97f5a4e6
fixed matrix_dimension_homeserver_federationUrl
2021-11-14 20:57:27 +02:00
b
7756cc4c8e
replace port 8048 with matrix_synapse_container_default_federation_port
2021-11-14 20:30:13 +02:00
JokerGermany
c0656448f7
Port 80 for IPv6
2021-11-13 01:18:22 +01:00
Toni Spets
f01b9c3865
Upgrade Heisenbridge (1.5.0 -> 1.6.0)
2021-11-12 04:50:29 +02:00
Slavi Pantaleev
c4d2c8394c
Abort if on an unsupported Postgres version (v9.6)
...
Official support ends today (2021-11-11).
Synapse still supports v9.6, but we'd better force users to transition
to newer versions anyway.
2021-11-11 15:42:34 +02:00
sakkiii
cd26af2f6f
Certbot Update (v1.20.0 -> v1.21.0)
2021-11-10 22:58:45 +05:30
sakkiii
7a4f49c457
Nginx Minio Update (1.21.3 -> 1.21.4)
2021-11-10 22:52:23 +05:30
Slavi Pantaleev
735c966ab6
Disable systemd services when stopping to uninstall them
...
Until now, we were leaving services "enabled"
(symlinks in /etc/systemd/system/multi-user.target.wants/).
We clean these up now. Broken symlinks may still exist in older
installations that enabled/disabled services. We're not taking care
to fix these up. It's just a cosmetic defect anyway.
2021-11-10 17:39:21 +02:00
teutat3s
367cddb715
Upgrade Element (v1.9.4)
2021-11-09 15:01:18 +01:00
Slavi Pantaleev
143b0f26d9
Restore usage of some _environment_variables_extension Jitsi variables
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1377
Regresion since https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1139
2021-11-08 10:34:09 +02:00
b
6eaa8ac65a
add server_name to matrix-synapsel.conf only if matrix_nginx_proxy_enabled
2021-11-05 15:31:10 +02:00
Toni Spets
09ac6a0e8c
Upgrade Heisenbridge (1.4.1 -> 1.5.0)
2021-11-05 10:31:31 +02:00
Slavi Pantaleev
7b8b595e81
Upgrade Synapse (1.45.1 -> 1.46.0)
2021-11-02 17:42:13 +02:00
Slavi Pantaleev
dae117c91b
Bump Hydrogen (0.2.7 -> 0.2.19)
2021-11-02 15:57:18 +02:00
Slavi Pantaleev
4586efebd7
Merge pull request #1369 from borisrunakov/configurable-ma1sd-port
...
change port 8090 to matrix_ma1sd_default_port
2021-11-01 10:50:14 +02:00
Slavi Pantaleev
0434e3bf8f
Allow force-patching webpack.config.js when self-building Element
...
We were applying the low-memory system patch to webpack.config.js
on systems with < 4GB memory.
From now on, we also let people force-enable patching by toggling the
`matrix_client_element_container_image_self_build_low_memory_system_patch_enabled`
variable.
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1357
2021-11-01 09:08:18 +02:00
b
dcda17595a
change port 8090 to matrix_ma1sd_default_port
2021-10-31 21:06:22 +02:00
Toni Spets
17fc055d53
Upgrade Heisenbridge (1.4.0 -> 1.4.1)
2021-10-31 18:31:31 +02:00
PC-Admin
c6c68e00a4
merge upstream
2021-10-31 08:56:48 +08:00
Patrick C. F. Ernzer
65182ea0f2
fixes #1365
...
docker-ce does not like quotes around the shm-size value
2021-10-30 13:13:30 +02:00
Slavi Pantaleev
fc593bc8ab
Increase shm-size for Postgres container to fix VACUUM
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1268
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1364
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1362
2021-10-30 09:53:56 +03:00
Slavi Pantaleev
c8a8035de4
Make it possible to self-build Element on low-memory devices (<4G RAM)
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1357
2021-10-29 11:13:01 +03:00
Slavi Pantaleev
39fa852ed6
Remove unnecessary if checks
...
Should have been done in 63f5a88fa0
.
2021-10-29 10:41:11 +03:00
Slavi Pantaleev
63f5a88fa0
Separate install/uninstall tasks for Element and Hydrogen
2021-10-29 10:29:54 +03:00
Toni Spets
124b9608fc
Upgrade Heisenbridge (1.3.0 -> 1.4.0)
2021-10-28 21:07:11 +03:00
Thom Wiggers
32f15e9bf0
update IRC appservice
...
https://github.com/matrix-org/matrix-appservice-irc/releases/tag/0.32.1
2021-10-28 15:21:58 +02:00
sakkiii
0231302db9
Upgrade grafana (8.1.4 -> 8.2.2)
2021-10-27 23:14:14 +05:30
sakkiii
d09609b3bd
Update prometheus (2.29.2 -> 2.30.3)
2021-10-27 23:11:01 +05:30
throwawayay
d31cdb071a
Upgrade Element (v1.9.3)
...
https://github.com/vector-im/element-web/releases/tag/v1.9.3
2021-10-25 12:44:58 -04:00
Slavi Pantaleev
06bcdcf9d2
Merge pull request #1311 from HarHarLinks/master
...
add auto proxy synapse worker metrics
2021-10-25 09:21:11 +03:00
Kim Brose
5f6bbafa17
fix space before tab in indent
2021-10-24 16:00:42 +02:00
Toni Spets
d7af78066b
Upgrade Heisenbridge (1.2.1 -> 1.3.0)
2021-10-21 19:55:13 +03:00
Slavi Pantaleev
09ac950d17
Fix dump importing (backup restore) into Postgres v14
...
In short, the problem is that older Postgres versions store passwords
hashed as md5. When you dump such a database, the dump naturally also
contains md5-hashed passwords.
Restoring from that dump used to create users and updates their passwords
with these md5 hashes.
However, Postgres v14 prefers does not like md5-hashed passwords now (by default),
which breaks connectivity. Postgres v14 prefers `scram-sha-256` for
authentication.
Our solution is to just ignore setting passwords (`ALTER ROLE ..`
statements) when restoring dumps. We don't need to set passwords as
defined in the dump anyway, because the playbook creates users
and manages their passwords by itself.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1340
2021-10-21 16:38:56 +03:00
PC-Admin
7f140e9be2
Merge remote-tracking branch 'upstream/master' into gomatrixhosting-testing
2021-10-21 10:27:45 +08:00
PC-Admin
725150565a
GoMatrixHosting v0.6.3 hotfix2
2021-10-21 10:25:23 +08:00
Slavi Pantaleev
86614d6357
Merge pull request #1345 from GoMatrixHosting/gomatrixhosting-testing
...
GoMatrixHosting v0.6.3 [hotfix]
2021-10-20 17:04:55 +03:00
Slavi Pantaleev
5dc2868269
Upgrade Synapse (1.45.0 -> 1.45.1)
2021-10-20 15:08:07 +03:00
HarHarLinks
7b33fc8e19
fixup! auto-generate prometheus.yml for workers metrics
2021-10-20 13:30:38 +02:00
HarHarLinks
ce41674e61
auto-generate prometheus.yml for workers metrics
2021-10-20 12:51:00 +02:00
HarHarLinks
4209c4208c
add own variable for worker metrics
...
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1311#issuecomment-945718866
2021-10-20 12:51:00 +02:00
PC-Admin
75cfad57ca
GoMatrixHosting v0.6.3 hotfix
2021-10-20 18:00:55 +08:00
Slavi Pantaleev
1dab178a44
Upgrade Synapse (1.44.0 -> 1.45.0)
2021-10-19 16:25:00 +03:00
PC-Admin
d65607c48f
Merge remote-tracking branch 'upstream/master' into gomatrixhosting-testing
2021-10-19 17:48:23 +08:00
PC-Admin
18395e73d3
GMH v0.6.3
2021-10-19 17:45:15 +08:00
Slavi Pantaleev
5284afc60e
Merge pull request #1333 from Samonitari/add-support-for-suse-linux
...
Add support for suse linux
2021-10-15 09:50:02 +03:00
Slavi Pantaleev
8c15555d00
Upgrade Element (1.9.0 -> 1.9.2)
2021-10-15 09:27:26 +03:00
Luke
1dac525e63
Added Mautrix Google Chat
2021-10-12 11:45:04 +00:00
Slavi Pantaleev
fb709152f3
Add self-building support for mautrix-whatsapp
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1322
2021-10-12 10:02:07 +03:00
Slavi Pantaleev
0c21b5a055
Merge pull request #1326 from GoMatrixHosting/gomatrixhosting-testing
...
GoMatrixHosting v0.6.2
2021-10-12 08:53:11 +03:00
Michael Collins
fc0296b56e
update element section
2021-10-12 12:20:53 +08:00
Aaron R
25d0ae7b67
Update matrix-appservice-slack (1.5.0 -> 1.8.0)
...
I am not using this bridge and haven't tested this but multiple people have said 1.5.0 isn't working and 1.8.0 works for them so it seems to make sense to update.
https://github.com/matrix-org/matrix-appservice-slack/issues/618#issuecomment-929849093
2021-10-11 18:36:07 -05:00
Michael Collins
c630bc3eaa
update element section
2021-10-11 15:13:09 +08:00
Michael Collins
46cba52e79
update element section
2021-10-11 15:00:11 +08:00
Michael Collins
b4654f8992
update element section
2021-10-11 14:53:52 +08:00
Michael Collins
927633321a
update element section
2021-10-11 13:34:46 +08:00
Michael Collins
676ba70971
update element section
2021-10-11 12:57:16 +08:00
Michael Collins
53f4b84d1f
update element section
2021-10-11 12:55:49 +08:00
Michael Collins
8ff0ae27b8
update element section
2021-10-11 12:15:15 +08:00
Michael Collins
9f0a8965d5
update element config
2021-10-11 11:43:58 +08:00
Michael Collins
36883150c6
update
2021-10-11 11:30:30 +08:00
Michael Collins
291efc1163
update element section
2021-10-11 11:20:28 +08:00
Michael Collins
6a8799afcc
wrap brand variable in single quotes too
2021-10-11 10:55:39 +08:00
Michael Collins
85bc12d14c
saner handling of background variable
2021-10-11 10:37:02 +08:00
Michael Collins
79acf6fc7e
update conditionals
2021-10-11 10:30:12 +08:00
Michael Collins
a352ea4674
derp
2021-10-11 10:23:37 +08:00
Michael Collins
1ae103bbbe
stop configure element from double wrapping this
2021-10-11 10:07:34 +08:00
Michael Collins
89c8ae94d6
update
2021-10-10 16:16:31 +08:00
Michael Collins
a631587ebd
this isnt needed
2021-10-10 14:44:27 +08:00
Michael Collins
07a5433c24
fix lineinfile
2021-10-10 14:39:36 +08:00
Michael Collins
dd6e643581
first round of variable name changes
2021-10-10 14:10:06 +08:00
Michael Collins
175bdb100b
first round of variable name changes
2021-10-10 13:23:49 +08:00
Michael Collins
6b9af38228
update?
2021-10-10 09:19:01 +08:00
Michael Collins
f4410514f5
update variable names
2021-10-09 15:45:49 +08:00
Michael Collins
de084c4d4d
fix variable name change
2021-10-09 15:43:47 +08:00
Michael Collins
fb23c7b697
Merge remote-tracking branch 'upstream/master' into gomatrixhosting-testing
2021-10-09 15:38:32 +08:00
Michael Collins
a60a43cb08
change naming scheme of variables that feature in deploy.
2021-10-09 15:21:10 +08:00
Michael Collins
42af090a7c
update naming scheme 1
2021-10-09 10:21:27 +08:00
Michael Collins
df9da052ab
fix conditional
2021-10-09 09:24:39 +08:00
Michael Collins
384dfdce4b
update?
2021-10-09 08:58:10 +08:00
Samonitari
6f99f95aa2
Merge branch 'master' of https://github.com/spantaleev/matrix-docker-ansible-deploy into add-support-for-suse-linux
2021-10-08 10:27:32 +02:00
Michael Collins
b0d56f6c18
update conditionals
2021-10-08 14:28:37 +08:00
Michael Collins
208dce51d8
add new survey entries for welcome page link, headline and text
2021-10-08 14:18:59 +08:00
Michael Collins
0f4cb513b8
update survey
2021-10-08 13:16:09 +08:00
Michael Collins
8d9d176c36
update?
2021-10-07 13:29:55 +08:00
Michael Collins
d1754915d1
improve conditional
2021-10-07 12:53:32 +08:00
Michael Collins
ecc0437520
add logo section
2021-10-07 12:49:59 +08:00
Slavi Pantaleev
2bf052369d
Upgrade certbot (v1.19.0 -> v1.20.0)
2021-10-06 15:14:38 +03:00
Slavi Pantaleev
278bbae4d5
Upgrade Synapse (1.43.0 -> 1.44.0)
2021-10-05 17:13:21 +03:00
Slavi Pantaleev
bad2c5296e
Merge pull request #1312 from HarHarLinks/patch-4
...
add how to generate htpasswd
2021-10-05 11:29:44 +03:00
Michael Collins
e3183ba267
Merge remote-tracking branch 'upstream/master' into gomatrixhosting-testing
2021-10-05 11:39:07 +08:00
Kim Brose
1ba7760ea4
add how to generate htpasswd
...
for matrix_nginx_proxy_proxy_synapse_metrics_basic_auth_key
resolves #1308
2021-10-04 22:18:05 +02:00
HarHarLinks
d9fa2f7ed4
add auto proxy synapse worker metrics
...
when matrix_nginx_proxy_proxy_synapse_metrics is enabled
2021-10-04 21:44:50 +02:00
Michael Collins
40506d5c5a
no log
2021-10-02 12:43:14 +08:00
Slavi Pantaleev
b5d8444764
Add self-building support to matrix-bridge-appservice-webhooks
2021-10-01 16:37:37 +03:00
Michael Collins
c8744ef9a9
update deploy role for new awx token authentication method
2021-10-01 18:56:38 +08:00
Slavi Pantaleev
096c960b84
Add support for Postgres v14
2021-10-01 11:27:40 +03:00
Slavi Pantaleev
256d3ffec5
Merge pull request #1304 from apmechev/update-linkedin-0.5.1
...
Upgrade LinkedIn (0.5.0 -> 0.5.1)
2021-10-01 10:15:08 +03:00
Toni Spets
3119ef4574
Upgrade Heisenbridge (1.2.0 -> 1.2.1)
2021-09-30 08:42:58 +03:00
Slavi Pantaleev
b4b14539a7
Use ntp (instead of systemd-timesyncd) on Ubuntu 18.04
...
Seems like Ubuntu 18.04 does not have a dedicated `systemd-timesyncd` package, nor
does it include the `systemd-timesyncd` binary in the main `systemd` package.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1302
Regression since https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1192
2021-09-28 13:38:27 +03:00
Alexandar Mechev
f02c08dc7f
Upgrade LinkedIn (0.5.0 -> 0.5.1)
2021-09-28 11:07:43 +02:00
Oli
59d4532efb
Upgrade Element (1.8.5 -> 1.9.0)
2021-09-28 07:40:00 +02:00
Jan
0ed585baa7
Archlinux: remove package systemd-timesyncd
...
#1192 lead to the following error for me on Archlinux:
`TASK [matrix-base : Install host dependencies] *******************************************************************************************************************************
fatal: [matrix.***.de]: FAILED! => changed=false
msg: |-
failed to install systemd-timesyncd: error: target not found: systemd-timesyncd`
There is no package called `systemd-timesyncd` on Archlinux. The service is installed with the [`systemd`](https://archlinux.org/packages/core/x86_64/systemd/ ) package itself.
I suggest removing the `systemd-timesyncd` from 2453876eb9/roles/matrix-base/tasks/server_base/setup_archlinux.yml (L7)
2021-09-26 11:48:03 +02:00
Slavi Pantaleev
31396f0615
Merge pull request #1295 from nogweii/feat-support-upstream-https-forwarded
...
Support trusting the upstream server when it says the protocol is HTTPS
2021-09-26 09:54:15 +03:00
Slavi Pantaleev
4f841a7001
Merge pull request #1192 from sakkiii/patch-1
...
migrate from ntp to systemd-timesyncd for ubuntu & Archlinux
2021-09-25 10:15:40 +03:00
Slavi Pantaleev
62ce06e28c
Merge pull request #1298 from GoMatrixHosting/gomatrixhosting-testing
...
GoMatrixHosting v0.6.0
2021-09-25 09:35:53 +03:00
Michael Collins
9a4187c852
Merge remote-tracking branch 'upstream/master' into gomatrixhosting-testing
2021-09-25 10:56:26 +08:00
Aaron Raimist
a676b5358c
Fix hydrogen OCSP typo
...
From 6f80292745
2021-09-24 20:09:06 -05:00
Colin Shea
2578ca4cee
rename matrix_nginx_proxy_x_forwarded_header_value -> matrix_nginx_proxy_x_forwarded_proto_value
2021-09-24 05:22:30 -07:00
Colin Shea
d0cd67044e
replace $scheme with X-Forwarded-Proto when enabled
2021-09-24 05:14:38 -07:00
Toni Spets
ff63f4efce
Upgrade Heisenbridge (1.1.1 -> 1.2.0)
2021-09-23 10:18:46 +03:00
Michael Collins
33c471477f
remove commented section
2021-09-22 09:44:52 +08:00
Slavi Pantaleev
7934cde90f
Upgrade Synapse (1.42.0 -> 1.43.0)
...
Related to:
- https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1287
- https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1288
.. but does it in a more complete way
2021-09-21 18:17:50 +03:00
Slavi Pantaleev
35153093fc
Merge pull request #1283 from wol-win/irc-update
...
Update irc bridge version (release-0.30.0 -> release-0.31.0)
2021-09-21 10:51:11 +03:00
WobbelTheBear
d82b98a522
Upgrade mjolnir (v0.1.19 -> v1.1.20)
...
Upgrade mjolnir (v0.1.19 -> v1.1.20)
Remark: interesting version number increase :-)
2021-09-20 16:53:13 +02:00
WobbelTheBear
f542a3a7c8
Update release (release-0.30.0 -> release-0.31.0)
...
Update release (release-0.30.0 -> release-0.31.0)
2021-09-20 16:49:30 +02:00
Michael Collins
6902ee5aa7
add rotate ssh module to matrix-awx
2021-09-19 17:12:12 +08:00
Toni Spets
8b9c7b18ac
Upgrade Heisenbridge (1.1.0 -> 1.1.1)
2021-09-17 21:31:02 +03:00
sakkiii
255cb97c41
Upgrade grafana (8.1.3 -> 8.1.4)
2021-09-17 15:50:06 +05:30
Slavi Pantaleev
b166f0175a
Upgrade Element (1.8.4 -> 1.8.5)
2021-09-15 09:36:21 +03:00
sakkiii
3055b3996e
Updates Certbot -> v1.19.0, nginx ->1.21.3-alpine
2021-09-14 16:51:01 +05:30
Toni Spets
4adbefab82
Upgrade Heisenbridge (1.0.1 -> 1.1.0)
2021-09-14 11:17:28 +03:00
Krisztian Szegi
f364fba182
Fix tripping on timesync setup
2021-09-14 08:35:20 +02:00
Slavi Pantaleev
4b46913278
Upgrade Element (1.8.2 -> 1.8.4) to patch a security issue
...
See:
- https://github.com/vector-im/element-web/releases/tag/v1.8.4
- https://matrix.org/blog/2021/09/10/pre-disclosure-upcoming-critical-fix-for-several-popular-matrix-clients
2021-09-13 16:24:09 +03:00
Aaron Raimist
f7e614b644
Add comment explaining why this step goes here
2021-09-11 20:44:00 -05:00
Aaron Raimist
82641092a7
Revert "Move some related tasks closer together in matrix-client-hydrogen"
...
This reverts commit e913347fe1
.
2021-09-11 20:43:08 -05:00
WobbelTheBear
df13ea5f14
Upgrade grafana (8.1.2 -> 8.1.3) ( #1269 )
...
Upgrade grafana (8.1.2 -> 8.1.3)
2021-09-09 09:33:22 +03:00
Slavi Pantaleev
0faad74a44
Upgrade Synapse (1.41.1 -> 1.42.0)
2021-09-07 20:44:18 +03:00
Michael Collins
8339103594
revert unneeded changes
2021-09-04 15:08:07 +08:00
Michael Collins
ca705cf9dd
Merge remote-tracking branch 'upstream/master' into testing
2021-09-04 14:24:13 +08:00
sakkiii
ae6caf158a
Added variable matrix_nginx_proxy_request_timeout ( #1265 )
...
* add timeout param for nginx proxy
default value matrix_nginx_proxy_request_timeout is 60s
* default matrix_nginx_proxy_request_timeout - 60s
* few more variables for request timeout
* Update nginx.conf.j2
* Update nginx.conf.j2
2021-09-03 10:00:45 +03:00