From ed486e8dbb0b2f59cdd612b7dfa25bc5b4142e62 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Feb 18 2020 18:55:55 +0000
Subject: Load profile from the pillar


---

diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index f2ec648..58e3af8 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -16,3 +16,8 @@ sudoers:
       groups:
         matrix-admins:
           - 'ALL=(ALL) ALL'
+
+apparmor:
+  profiles:
+    matrix-synapse:
+      source: salt://profile/matrix/files/matrix-synapse.apparmor
diff --git a/salt/profile/matrix/config.sls b/salt/profile/matrix/config.sls
index 2bb5a3e..45cae55 100644
--- a/salt/profile/matrix/config.sls
+++ b/salt/profile/matrix/config.sls
@@ -20,13 +20,6 @@ synapse_conf_file:
     - watch_in:
       - module: synapse_restart
 
-synapse_apparmor_file:
-  file.managed:
-    - name: /etc/apparmor.d/matrix-synapse
-    - source: salt://profile/matrix/files/matrix-synapse.apparmor
-    - require_in:
-      - service: synapse_service
-
 synapse_appservice_discord_file:
   file.managed:
     - name: /etc/matrix-synapse/appservices/appservice-discord.yaml