Merge branch 'master' into synapse-workers

2021-01-27 10:27:17 +02:00
parent a9af36841d 512f42aa76
commit d98a1ceadd
36 changed files with 154 additions and 148 deletions
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@ -66,6 +66,7 @@ matrix_host_command_chown: "/usr/bin/env chown"
 matrix_host_command_fusermount: "/usr/bin/env fusermount"
 matrix_host_command_openssl: "/usr/bin/env openssl"
 matrix_host_command_systemctl: "/usr/bin/env systemctl"
+matrix_host_command_sh: "/usr/bin/env sh"

 matrix_ntpd_package: "ntp"
 matrix_ntpd_service: "{{ 'ntpd' if ansible_os_family == 'RedHat' or ansible_distribution == 'Archlinux' else 'ntp' }}"