mirror of
https://github.com/saltstack-formulas/users-formula.git
synced 2024-11-27 22:38:34 +01:00
'None' works in an unexpected way. Reverting back to 'False'.
This reverts commit 48416398e3
.
This commit is contained in:
parent
48416398e3
commit
335bc31095
@ -9,8 +9,8 @@ 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_file_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:file_mode'), None) -%}
|
||||
{%- set user_files_sym_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:sym_mode'), 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 -%}
|
||||
|
||||
{%- if user_files.source is defined -%}
|
||||
@ -37,10 +37,10 @@ users_userfiles_{{ username }}_recursive:
|
||||
- user: {{ username }}
|
||||
- group: {{ user_group }}
|
||||
- clean: False
|
||||
{% if user_files_file_mode is not None -%}
|
||||
{% if user_files_file_mode -%}
|
||||
- file_mode: {{ user_files_file_mode }}
|
||||
{% endif -%}
|
||||
{% if user_files_sym_mode is not None -%}
|
||||
{% if user_files_sym_mode -%}
|
||||
- sym_mode: {{ user_files_sym_mode }}
|
||||
{% endif -%}
|
||||
- include_empty: True
|
||||
|
Loading…
Reference in New Issue
Block a user