mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-25 02:18:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,626 Commits 5 Branches 0 Tags 31 MiB
b297e8ee2b
Commit Graph

2275 Commits

Author SHA1 Message Date
ppacheco28
6e38ce42d8 Added check before stopping service, fixed unnecessary checking of user attributes, and created sections to clarify the file's purpose 2021-12-09 07:40:25 -03:00
ppacheco28
d086668f52 Ensure internal authentication users are properly configured 2021-12-09 02:42:36 -03:00
ppacheco28
dd1feffcc2 Add support for Jitsi internal authentication user creation 2021-12-08 20:14:18 -03:00
ppacheco28
f2cd37685c Add support for Jitsi internal authentication user creation 2021-12-08 19:52:05 -03:00
John M
286871b9b5 Add self-build for Dimension 
Add a self-build option for the Dimension Dockerfile.
 - This helps further support arm64 hosts (i.e. A1.Flex w/Oracle)
 2021-12-08 04:48:59 -08:00
Aaron Raimist
fac497faa5
Fix comments in other roles 2021-12-08 10:13:12 +00:00
Aaron R
421b055cb5
Fix comment about matrix_mautrix_whatsapp_database_* variables 
Was renamed in 087dbe4ddc

It is unclear to me if there is anything you actually need to adjust with these variables. It looks like that is done automatically in `matrix_servers`.
 2021-12-08 04:09:09 -06:00
Aaron Raimist
0071828503
Run workers-doc-to-yaml.sh 
1472958e25 reverted some of the v3 changes. I'm not sure why. Running the `workers-doc-to-yaml.sh` script now puts them back 🤷‍♂️.
 2021-12-08 08:37:55 +00:00
Catalan Lover
18daf8f3da
Update Grafana from 8.3.0 to 8.3.1 due to Security Flaw 
https://grafana.com/blog/2021/12/07/grafana-8.3.1-8.2.7-8.1.8-and-8.0.7-released-with-high-severity-security-fix/
 2021-12-07 21:52:49 +01:00
Slavi Pantaleev
ff720bedce Upgrade matrix-postgres-backup default to v14 
Related to c08880d175
 2021-12-07 19:43:33 +02:00
WobbelTheBear
391e095cb9
Update main.yml 2021-12-06 19:56:13 +01:00
Slavi Pantaleev
9babaa5a2b Fix mx-puppet-discord media URLs using container-network URLs (http://matrix-nginx-proxy:12080) 2021-12-06 13:40:01 +02:00
Jan
20bc3eb24b Update signal bridge configuration template 2021-12-04 22:08:59 +01:00
Slavi Pantaleev
42352b491c
Merge pull request #1432 from wol-win/prometheus 
Update prometheus (v2.30.3 -> v2.31.1)
 2021-12-02 15:01:03 +02:00
Slavi Pantaleev
971a751a5e
Merge pull request #1433 from wol-win/redis 
Update redis (6.2.4 -> 6.2.6)
 2021-12-02 15:00:45 +02:00
WobbelTheBear
229b93d7c8
Update redis (6.2.4 -> 6.2.6) 2021-12-02 13:54:57 +01:00
WobbelTheBear
3f0e8122ec
Update prometheus 2021-12-02 13:41:12 +01:00
WobbelTheBear
27e1451cbc
Update main.yml 2021-12-02 13:31:57 +01:00
Slavi Pantaleev
d584b44f10 Upgrade matrix-corporal (2.2.1 -> 2.2.2) 2021-12-01 08:23:35 +02:00
Slavi Pantaleev
1472958e25 Upgrade Synapse (1.47.1 -> 1.48.0) 2021-11-30 16:35:23 +02:00
SkepticalWaves
8e1463a6a1
Update matrix-bridge-mautrix-telegram version 2021-11-28 21:59:33 -05:00
Slavi Pantaleev
61391647e9 Make /.well-known/matrix/client and /.well-known/matrix/server customizable 
We recently had someone need to inject additional configuration into
`/.well-known/matrix/client` as described here:
22b245bbd1/docs/bigbluebutton.md (have-dimension-create-meetings-with-elements-video-call-button)

There may be other use cases as well.
 2021-11-26 15:28:03 +02:00
Slavi Pantaleev
cfc79ebe29 Upgrade exim-relay (4.94.2-r0-5 -> 4.95-r0) 2021-11-25 09:21:05 +02:00
Slavi Pantaleev
3a9fe48deb Make matrix-nginx-proxy's X-Forwarded-For header customizable 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1393
 2021-11-24 11:32:06 +02:00
PC-Admin
37191d98c5 GoMatrixHosting v0.6.6 2021-11-24 10:43:25 +08:00
Toni Spets
e8a57ad432 Upgrade Heisenbridge (1.7.0 -> 1.7.1) 2021-11-23 15:03:09 +02:00
Slavi Pantaleev
6b07ee3b58 Upgrade Synapse (1.47.0 -> 1.47.1) - security fixes 
Learn more here: https://github.com/matrix-org/synapse/releases/tag/v1.47.1
 2021-11-23 14:50:07 +02:00
WobbelTheBear
e11e31e2c6
Update main.yml 2021-11-22 16:53:20 +01:00
Slavi Pantaleev
fc751f0330 Upgrade exim-relay (4.94.2-r0-4 -> 4.94.2-r0-5) 2021-11-20 09:31:04 +02:00
Slavi Pantaleev
2734adfb4e Upgrade matrix-corporal (2.2.0 -> 2.2.1) 2021-11-20 09:28:27 +02:00
Slavi Pantaleev
3b27ce2ff6
Merge pull request #1404 from aaronraimist/v3 
Allow workers to serve new v3 APIs
 2021-11-19 10:54:47 +02:00
Slavi Pantaleev
2e73dac39f Upgrade matrix-corporal (2.1.4 -> 2.2.0) 
There was also a 2.1.5 security release made today.
2.2.0 contains the same security fix + more.

Both make handling of Client-Server API v3-prefixed requests better.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1404
 2021-11-19 10:53:09 +02:00
Toni Spets
110d91b06e Upgrade Heisenbridge (1.6.0 -> 1.7.0) 2021-11-18 13:05:30 +02:00
rakshazi
d41e9230da
expose smtp_user and smtp_pass to ansible configs (role: matrix-synapse) 2021-11-17 21:34:46 +02:00
Slavi Pantaleev
e1a6d1e4b2 Upgrade Synapse (1.46.0 -> 1.47.0) 
We had to remove UID/GID environment variables that we used to pass
to the Synapse container, because it was causing a problem after
https://github.com/matrix-org/synapse/pull/11209

We were using both `--user` and UID/GID environment variables until now.
 2021-11-17 17:21:15 +02:00
Aaron Raimist
f8fe68b385
Allow workers to serve new v3 APIs 
1f196f59cb
 2021-11-17 14:54:49 +00:00
Slavi Pantaleev
75cb4ce3b0 Add warning about matrix_ma1sd_default_port being renamed 
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1403
 2021-11-17 10:38:52 +02:00
Slavi Pantaleev
b4fb819481
Merge pull request #1403 from borisrunakov/rename-matrix-ma1sd-default-port 
remove default from variable name
 2021-11-17 10:35:54 +02:00
Slavi Pantaleev
6bbc2054b8
Merge pull request #1402 from borisrunakov/matrix-synapse-container-client-api-port 
make 8008 configurable
 2021-11-17 10:34:40 +02:00
boris runakov
394ecb0acc remove default from variable name 2021-11-16 21:14:28 +02:00
boris runakov
d3a9ec98de refactoring 2021-11-16 21:03:21 +02:00
Slavi Pantaleev
5fc533eca5
Merge pull request #1400 from IUCCA/master 
Updated Mautrix-WhatsApp config
 2021-11-16 15:50:06 +02:00
iucca
949ae80117 added server_map variable and renamed secret_map 2021-11-16 14:22:06 +01:00
iucca
b272e6147a Resolved server_map 2021-11-16 13:37:11 +01:00
boris runakov
1ec67f49b0 replaced 8008 where possible 2021-11-15 22:43:05 +02:00
IUCCA
adf2dc13b3
Update main.yml 2021-11-15 19:27:49 +01:00
iucca
3535c97117 updated whatsapp config 2021-11-15 19:25:08 +01:00
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