fix(debian-ish): root owns the logs

myii · Jul 13, 2019 · 3276d3b · 3276d3b
1 parent 3d5723d
commit 3276d3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/openvpn/config.sls b/openvpn/config.sls
@@ -169,7 +169,7 @@ openvpn_{{ type }}_{{ name }}_log_file:
     - name: {{ config.log }}
     - makedirs: True
     - replace: False
-    {{ _permissions(640) }}
+    {{ _permissions(640, map.log_user) }}
     - require_in:
       {%- if map.multi_services %}
       - service: openvpn_{{name}}_service
@@ -185,7 +185,7 @@ openvpn_{{ type }}_{{ name }}_log_file_append:
     - name: {{ config.log_append }}
     - makedirs: True
     - replace: False
-    {{ _permissions(640) }}
+    {{ _permissions(640, map.log_user) }}
     - require_in:
       {%- if map.multi_services %}
       - service: openvpn_{{name}}_service

diff --git a/openvpn/defaults.yaml b/openvpn/defaults.yaml
@@ -7,6 +7,8 @@ openvpn:
   external_repo_supported: []
   external_repo_version: stable
   group: nobody
+  # None, will default to 'user'
+  log_user:
   multi_services: False
   pkgs: ['openvpn']
   service: openvpn

diff --git a/openvpn/osfamilymap.yaml b/openvpn/osfamilymap.yaml
@@ -4,6 +4,7 @@ Arch:
     - easy-rsa
 Debian:
   group: nogroup
+  log_user: root
 RedHat:
   pkgs:
     - openvpn
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ Arch: @@
         - easy-rsa
     Debian:
       group: nogroup
+      log_user: root
     RedHat:
       pkgs:
         - openvpn
@@ Expand Down @@