Merge "Enforce ownership and permissions"
diff --git a/heka/_common.sls b/heka/_common.sls
index 1753840..9f71c31 100644
--- a/heka/_common.sls
+++ b/heka/_common.sls
@@ -7,15 +7,24 @@
/usr/share/lma_collector:
file.recurse:
- source: salt://heka/files/lua
+ - user: root
+ - group: heka
+ - file_mode: 640
+ - dir_mode: 750
+ - require:
+ - user: heka_user
/usr/share/lma_collector/common/extra_fields.lua:
file.managed:
- source: salt://heka/files/extra_fields.lua
- user: root
- - mode: 644
+ - group: heka
+ - mode: 640
- defaults:
extra_fields: {{ server.extra_fields }}
- template: jinja
+ - require:
+ - user: heka_user
heka_user:
user.present:
diff --git a/heka/_service.sls b/heka/_service.sls
index 359e716..70d80ce 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -13,6 +13,7 @@
file.directory:
- name: /var/cache/{{ service_name }}
- user: heka
+ - group: heka
- mode: 750
- makedirs: true