From 2d5fb596a9e696a7354c142ef4f283f8a2e25679 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 10 Jul 2019 11:48:35 +0200 Subject: [PATCH] [users/init] use createhome from defaults Related to change operated in https://github.com/saltstack-formulas/users-formula/commit/634deacc73081f282736707af22fb53cfee30cbe --- users/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/init.sls b/users/init.sls index 2cf2af0..7929fc6 100644 --- a/users/init.sls +++ b/users/init.sls @@ -67,8 +67,8 @@ include: {%- endif -%} {%- set current = salt.user.info(name) -%} {%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%} -{%- set createhome = user.get('createhome') -%} - +{%- set createhome = user.get('createhome', current.get('createhome', users.get('createhome'))) -%} + {%- if 'prime_group' in user and 'name' in user['prime_group'] %} {%- set user_group = user.prime_group.name -%} {%- else -%}