diff --git a/states/apparmor/init.sls b/states/apparmor/init.sls index e0e8da6..d478f42 100644 --- a/states/apparmor/init.sls +++ b/states/apparmor/init.sls @@ -4,8 +4,8 @@ {%- for cfg in apparmor.configs %} apparmor-{{ cfg }}: file.managed: - - name: "/etc/apparmor.d/{{ cfg }}" - - source: "salt://apparmor/{{ cfg }}.j2" + - name: /etc/apparmor.d/{{ cfg }} + - source: salt://apparmor/templates/{{ cfg }}.j2 - user: root - group: root - mode: "0644" @@ -18,4 +18,4 @@ apparmor-reload: service.running: - name: apparmor - enable: true -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/apparmor/opt.kingsoft.j2 b/states/apparmor/templates/opt.kingsoft.j2 similarity index 99% rename from states/apparmor/opt.kingsoft.j2 rename to states/apparmor/templates/opt.kingsoft.j2 index fd28818..6c5978c 100644 --- a/states/apparmor/opt.kingsoft.j2 +++ b/states/apparmor/templates/opt.kingsoft.j2 @@ -24,4 +24,4 @@ owner @{HOME}/Documents/** rw, deny network inet, -} \ No newline at end of file +} diff --git a/states/apparmor/opt.sublime_text.sublime_text.j2 b/states/apparmor/templates/opt.sublime_text.sublime_text.j2 similarity index 99% rename from states/apparmor/opt.sublime_text.sublime_text.j2 rename to states/apparmor/templates/opt.sublime_text.sublime_text.j2 index 947133e..de92d45 100644 --- a/states/apparmor/opt.sublime_text.sublime_text.j2 +++ b/states/apparmor/templates/opt.sublime_text.sublime_text.j2 @@ -38,4 +38,4 @@ deny network inet, deny network inet6, deny network raw, -} \ No newline at end of file +} diff --git a/states/apparmor/usr.bin.skype.j2 b/states/apparmor/templates/usr.bin.skype.j2 similarity index 99% rename from states/apparmor/usr.bin.skype.j2 rename to states/apparmor/templates/usr.bin.skype.j2 index 0fb3c34..911ecb0 100644 --- a/states/apparmor/usr.bin.skype.j2 +++ b/states/apparmor/templates/usr.bin.skype.j2 @@ -74,4 +74,4 @@ deny /var/cache/fontconfig/ w, deny owner @{HOME}/.fontconfig/ w, deny owner @{HOME}/.fontconfig/*.cache-*.TMP* w, -} \ No newline at end of file +} diff --git a/states/apparmor/usr.bin.spotify.j2 b/states/apparmor/templates/usr.bin.spotify.j2 similarity index 99% rename from states/apparmor/usr.bin.spotify.j2 rename to states/apparmor/templates/usr.bin.spotify.j2 index 0893217..2938c92 100644 --- a/states/apparmor/usr.bin.spotify.j2 +++ b/states/apparmor/templates/usr.bin.spotify.j2 @@ -21,4 +21,4 @@ owner @{HOME}/.config/spotify/ w, owner @{HOME}/Music/** r, -} \ No newline at end of file +}