Procházet zdrojové kódy

'None' works in an unexpected way. Reverting back to 'False'.

This reverts commit 48416398e3.
master
Hatifnatt před 7 roky
rodič
revize
335bc31095
1 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. +4
    -4
      users/user_files.sls

+ 4
- 4
users/user_files.sls Zobrazit soubor

{%- set user_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%} {%- 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_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_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.enabled -%}


{%- if user_files.source is defined -%} {%- if user_files.source is defined -%}
- user: {{ username }} - user: {{ username }}
- group: {{ user_group }} - group: {{ user_group }}
- clean: False - clean: False
{% if user_files_file_mode is not None -%}
{% if user_files_file_mode -%}
- file_mode: {{ user_files_file_mode }} - file_mode: {{ user_files_file_mode }}
{% endif -%} {% endif -%}
{% if user_files_sym_mode is not None -%}
{% if user_files_sym_mode -%}
- sym_mode: {{ user_files_sym_mode }} - sym_mode: {{ user_files_sym_mode }}
{% endif -%} {% endif -%}
- include_empty: True - include_empty: True

Načítá se…
Zrušit
Uložit