From 88909dc0322398d9eee08cb15de726cf2c085c75 Mon Sep 17 00:00:00 2001 From: Jerry van Leeuwen Date: Thu, 21 Sep 2017 18:20:13 -0700 Subject: [PATCH] Consistency improvement for variable name --- users/user_files.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/users/user_files.sls b/users/user_files.sls index df13c43..874f0c2 100644 --- a/users/user_files.sls +++ b/users/user_files.sls @@ -9,7 +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 template = salt['pillar.get'](('users:' ~ username ~ ':user_files:template'), None) -%} +{%- 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 -%} @@ -37,8 +37,8 @@ users_userfiles_{{ username }}_recursive: - source: {{ file_source }} - user: {{ username }} - group: {{ user_group }} - {%- if template is not None -%} - - template: {{ template }} + {%- if user_files_template is not None -%} + - template: {{ user_files_template }} {%- endif -%} - clean: False {% if user_files_file_mode -%}