From 48ba3093ebc84b79c30ea2e63f3231f2ecfe93b8 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Apr 19 2020 16:07:18 +0000
Subject: Use images from static for riot and dimension


---

diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index bfce315..9880be8 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -57,6 +57,9 @@ nginx:
                     - index:
                         - index.html
                         - index.htm
+                - location /vector-icons/:
+                    - proxy_set_header: X-Forwarded-For $remote_addr
+                    - proxy_pass: https://static.opensuse.org/chat/favicons/
                 - location ~* \.(?:ttf|otf|eot|woff)$:
                     - add_header: Access-Control-Allow-Origin "*"
                 - access_log: /var/log/nginx/chat.access.log combined
@@ -71,6 +74,9 @@ nginx:
                 - location /:
                     - proxy_set_header: X-Forwarded-For $remote_addr
                     - proxy_pass: http://localhost:8184
+                - location /img/avatars/:
+                    - proxy_set_header: X-Forwarded-For $remote_addr
+                    - proxy_pass: https://static.opensuse.org/chat/integrations/
           enabled: True
         matrix.opensuse.org:
           config:
diff --git a/salt/profile/matrix/config.sls b/salt/profile/matrix/config.sls
index 44d45e8..ef77879 100644
--- a/salt/profile/matrix/config.sls
+++ b/salt/profile/matrix/config.sls
@@ -14,17 +14,6 @@ riot_conf_file:
     - require:
       - file: riot_conf_dir
 
-riot_custom_background_dir:
-  file.directory:
-    - name: /var/www/riot-web/themes/riot/img/backgrounds/
-
-riot_custom_background:
-  file.managed:
-    - name: /var/www/riot-web/themes/riot/img/backgrounds/valley.jpg
-    - source: salt://profile/matrix/files/valley.jpg
-    - require:
-      - file: riot_custom_background_dir
-
 synapse_conf_dir:
   file.directory:
     - name: /etc/matrix-synapse/
diff --git a/salt/profile/matrix/files/telegram.service b/salt/profile/matrix/files/telegram.service
index da59296..ee83ba2 100644
--- a/salt/profile/matrix/files/telegram.service
+++ b/salt/profile/matrix/files/telegram.service
@@ -9,7 +9,7 @@ RestartSec=3
 User=synapse
 Group=synapse
 WorkingDirectory=/var/lib/matrix-synapse/telegram/
-ExecStart=/usr/bin/python3 -m mautrix_telegram -c config.yaml -f telegram-registration.yaml -b /etc/mautrix-telegram/example-config.yaml
+ExecStart=/usr/bin/python3 -m mautrix_telegram -c config.yaml -r telegram-registration.yaml -b /etc/mautrix-telegram/example-config.yaml
 
 [Install]
 WantedBy=multi-user.target