From 4da9b00e75bed2ef5a7a371e62620df5934493aa Mon Sep 17 00:00:00 2001
From: Jerry van Leeuwen <jerryjvl@gmail.com>
Date: Thu, 21 Sep 2017 20:30:29 -0700
Subject: [PATCH] Add 'template' support to 'user_files' (#159)

* Add support for 'template' in 'user_files'

* Fix-up wrong nesting level for template value

* Small quality improvement for push upstream.

* Consistency improvement for variable name
---
 pillar.example       | 1 +
 users/user_files.sls | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/pillar.example b/pillar.example
index db93f1f..95de009 100644
--- a/pillar.example
+++ b/pillar.example
@@ -125,6 +125,7 @@ users:
       # should be a salt fileserver path either with or without 'salt://'
       # if not present, it defaults to 'salt://users/files/user/<username>
       source: users/files/default
+      template: jinja
       # You can specify octal mode for files and symlinks that will be copied. Since version 2016.11.0
       # it's possible to use 'keep' for file_mode, to preserve file original mode, thus you can save
       # execution bit for example.
diff --git a/users/user_files.sls b/users/user_files.sls
index dc654fe..874f0c2 100644
--- a/users/user_files.sls
+++ b/users/user_files.sls
@@ -9,6 +9,7 @@ include:
 {%- set user_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%}
 {%- set user_group = salt['pillar.get'](('users:' ~ username ~ ':prime_group:name'), username) -%}
 {%- set user_home = salt['pillar.get'](('users:' ~ username ~ ':home'), current.get('home', '/home/' ~ username )) -%}
+{%- set user_files_template = salt['pillar.get'](('users:' ~ username ~ ':user_files:template'), None) -%}
 {%- set user_files_file_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:file_mode'), False) -%}
 {%- set user_files_sym_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:sym_mode'), False) -%}
 {%- if user_files.enabled -%}
@@ -36,6 +37,9 @@ users_userfiles_{{ username }}_recursive:
     - source: {{ file_source }}
     - user: {{ username }}
     - group: {{ user_group }}
+    {%- if user_files_template is not None -%}
+    - template: {{ user_files_template }}
+    {%- endif -%}
     - clean: False
     {% if user_files_file_mode -%}
     - file_mode: {{ user_files_file_mode }}