From f8a9d8bc442fa2a7359eb2d1cbf37d8fc79bc821 Mon Sep 17 00:00:00 2001
From: Jacob Michalskie <hellcp@opensuse.org>
Date: Jan 02 2023 16:28:36 +0000
Subject: Some more small fixes


---

diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index c26e004..00d00ad 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -183,13 +183,13 @@ nginx:
                 - listen:
                     - 80
                 - location /:
-                    - return: 301 https://chat.opensuse.org
-                - location ~ "/..*":
                     - proxy_set_header: X-Forwarded-For $remote_addr
                     - proxy_pass: http://localhost:8184
                 - location /img/avatars/:
                     - proxy_set_header: Host static.opensuse.org
                     - proxy_pass: https://static.opensuse.org/chat/integrations/
+                - location ~* \.(?:ttf|otf|eot|woff)$:
+                    - add_header: Access-Control-Allow-Origin "*"
           enabled: True
         matrix.opensuse.org.conf:
           config:
diff --git a/salt/profile/matrix/appservice.sls b/salt/profile/matrix/appservice.sls
index 89c2753..7e7b0e1 100644
--- a/salt/profile/matrix/appservice.sls
+++ b/salt/profile/matrix/appservice.sls
@@ -2,6 +2,7 @@
 
 appservice_pgks:
   pkg.installed:
+    - resolve_capabilities: True
     - pkgs:
       - git
       - nodejs
diff --git a/salt/profile/matrix/files/appservice.service b/salt/profile/matrix/files/appservice.service
index 7014252..ed35ef0 100644
--- a/salt/profile/matrix/files/appservice.service
+++ b/salt/profile/matrix/files/appservice.service
@@ -4,7 +4,7 @@ Description=Matrix Appservice {{ dir }}
 [Service]
 Type=simple
 Restart=on-failure
-RestartSec=3600
+RestartSec=1
 
 User=synapse
 Group=synapse
diff --git a/salt/profile/matrix/telegram.sls b/salt/profile/matrix/telegram.sls
index b24e64d..b71f33a 100644
--- a/salt/profile/matrix/telegram.sls
+++ b/salt/profile/matrix/telegram.sls
@@ -1,9 +1,10 @@
 telegram_pgks:
   pkg.installed:
+    - resolve_capabilities: True
     - pkgs:
       - python3-mautrix-telegram
       # Required for webm for stickers
-      - ffmpeg-3
+      - ffmpeg
 
 telegram_conf_file:
   file.managed: