浏览代码

Merge pull request #112 from saltstack-formulas/revert-107-master

Revert "User files state without defined home directory"
lookup-fix-3
Niels Abspoel 8 年前
父节点
当前提交
aed2394758
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. +1
    -2
      users/user_files.sls

+ 1
- 2
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 }}

正在加载...
取消
保存