merge upstream

2021-03-16 21:52:26 +08:00
parent 571b70a1f4
commit 5a6bdb0c3d
44 changed files with 950 additions and 103 deletions
--- a/roles/matrix-common-after/tasks/start.yml
+++ b/roles/matrix-common-after/tasks/start.yml
@ -30,7 +30,7 @@
 # as we may run into systemd's automatic restart logic retrying the service.
 - name: Wait a bit, so that services can start (or fail)
  wait_for:
-    timeout: 5
+    timeout: 15
  delegate_to: 127.0.0.1
  become: false