From 4067e09409f0064c243daa46ddf9739d4a49dd7b Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 10 Mar 2019 22:23:06 +0200 Subject: [PATCH] Fix rare YAML parsing problems in Dimension config It's been reported that YAML parsing errors would occur on certain Ansible/Python combinations for some reason. It appears that a bare `{{ matrix_dimension_admins }}` would sometimes yield things like `[u'@user:domain.com', ..]` (note the `u` string prefix). To prevent such problems, we now explicitly serialize with `|to_json`. --- roles/matrix-dimension/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/matrix-dimension/defaults/main.yml b/roles/matrix-dimension/defaults/main.yml index 20c2f4e8..d66aecd0 100644 --- a/roles/matrix-dimension/defaults/main.yml +++ b/roles/matrix-dimension/defaults/main.yml @@ -61,7 +61,7 @@ matrix_dimension_configuration_yaml: | # These users can modify the integrations this Dimension supports. # To access the admin interface, open Dimension in Riot and click the settings icon. - admins: {{ matrix_dimension_admins }} + admins: {{ matrix_dimension_admins|to_json }} # IPs and CIDR ranges listed here will be blocked from being widgets. # Note: Widgets may still be embedded with restricted content, although not through Dimension directly. @@ -101,7 +101,7 @@ matrix_dimension_configuration_yaml: | fileLevel: info rotate: size: 52428800 # bytes, default is 50mb - count: 5 + count: 5 matrix_dimension_configuration_extension_yaml: | @@ -117,7 +117,7 @@ matrix_dimension_configuration_extension_yaml: | # telegram: # botToken: "YourTokenHere" # - + # Holds the final Dimension configuration (a combination of the default and its extension). # You most likely don't need to touch this variable. Instead, see `matrix_dimension_configuration_yaml`.