From b7370f7dfba30dac95da6d10a239583a278bd80c Mon Sep 17 00:00:00 2001 From: Forrest Date: Thu, 12 May 2016 11:18:44 -0700 Subject: [PATCH] Revert "User files state without defined home directory" --- users/user_files.sls | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/users/user_files.sls b/users/user_files.sls index 9914598..66363ae 100644 --- a/users/user_files.sls +++ b/users/user_files.sls @@ -7,7 +7,6 @@ include: {%- for username, user in salt['pillar.get']('users', {}).items() if (user.absent is not defined or not user.absent) -%} {%- 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 home = user.get('home', "/home/%s" % username) -%} {%- if user_files.enabled -%} {%- if user_files.source is defined -%} @@ -29,7 +28,7 @@ include: {%- if not skip_user %} users_userfiles_{{ username }}_recursive: file.recurse: - - name: {{ home }} + - name: {{ user.home }} - source: {{ file_source }} - user: {{ username }} - group: {{ user_group }}