Browse Source

Merge pull request #98 from outime/master

Adds 'empty_password' statement for states.user.present (issue #97)
tags/v0.45.0
puneet kandhari 9 years ago
parent
commit
bcd6b44c70
2 changed files with 6 additions and 0 deletions
  1. +3
    -0
      pillar.example
  2. +3
    -0
      users/init.sls

+ 3
- 0
pillar.example View File

fullname: B User fullname: B User
password: $6$w............. password: $6$w.............
enforce_password: True enforce_password: True
# WARNING: If 'empty_password' is set to True, the 'password' statement
# will be ignored by enabling password-less login for the user.
empty_password: False
home: /custom/buser home: /custom/buser
createhome: True createhome: True
roomnumber: "A-1" roomnumber: "A-1"

+ 3
- 0
users/init.sls View File

{% if 'password' in user -%} {% if 'password' in user -%}
- password: '{{ user['password'] }}' - password: '{{ user['password'] }}'
{% endif -%} {% endif -%}
{% if user.get('empty_password') -%}
- empty_password: {{ user.get('empty_password') }}
{% endif -%}
{% if 'enforce_password' in user -%} {% if 'enforce_password' in user -%}
- enforce_password: {{ user['enforce_password'] }} - enforce_password: {{ user['enforce_password'] }}
{% endif -%} {% endif -%}

Loading…
Cancel
Save