From 11713f0099cb46aca1f8d6ddc783d8e2eda8c789 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 21 2020 11:54:03 +0000
Subject: Merge branch 'hellcp/matrix-missing' into 'production'


Fix missing bits of the matrix profile

See merge request infra/salt!392
---

diff --git a/salt/profile/matrix/dimension.sls b/salt/profile/matrix/dimension.sls
index 543a826..89ac7a1 100644
--- a/salt/profile/matrix/dimension.sls
+++ b/salt/profile/matrix/dimension.sls
@@ -2,6 +2,10 @@
   file.directory:
     - user: synapse
 
+/var/log/matrix-synapse/dimension:
+  file.directory:
+    - user: synapse
+
 https://github.com/turt2live/matrix-dimension.git:
   git.latest:
     - branch: master
diff --git a/salt/profile/matrix/files/config-telegram.yaml b/salt/profile/matrix/files/config-telegram.yaml
index 6c62f12..9601d73 100644
--- a/salt/profile/matrix/files/config-telegram.yaml
+++ b/salt/profile/matrix/files/config-telegram.yaml
@@ -96,7 +96,7 @@ bridge:
     alias_template: telegram_{groupname}
     # Displayname template for Telegram users.
     # {displayname} is replaced with the display name of the Telegram user.
-    displayname_template: {displayname} [Telegram]
+    displayname_template: '{displayname} [Telegram]'
 
     # Set the preferred order of user identifiers which to use in the Matrix puppet display name.
     # In the (hopefully unlikely) scenario that none of the given keys are found, the numeric user
@@ -283,7 +283,7 @@ bridge:
     #   domain - All users on that homeserver
     #     mxid - Specific user
     permissions:
-        '*'': 'relaybot'
+        '*': 'relaybot'
         '@hellcp:opensuse.org': 'admin'
 
     # Options related to the message relay Telegram bot.
diff --git a/salt/profile/matrix/telegram.sls b/salt/profile/matrix/telegram.sls
index 11e070b..cd18d7f 100644
--- a/salt/profile/matrix/telegram.sls
+++ b/salt/profile/matrix/telegram.sls
@@ -9,6 +9,10 @@ telegram_pgks:
   file.directory:
     - user: synapse
 
+/var/log/matrix-synapse/telegram:
+  file.directory:
+    - user: synapse
+
 /var/lib/matrix-synapse/telegram/alembic:
   file.symlink:
     - target: /usr/share/alembic