Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Version 1.4.4
Browse files Browse the repository at this point in the history
fixed
  • Loading branch information
sbaerlocher committed Feb 3, 2020
2 parents 600aeab + e16105d commit 96bfbdc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).

## 1.4.4

### Fixed

- fixed password expired default
- fixed Linux User default

## 1.4.3

### Fixed
Expand Down
19 changes: 5 additions & 14 deletions tasks/distribution/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,11 @@
comment: '{{ item.name | default(omit) }}'
system: '{{ item.system | default(omit) }}'
generate_ssh_key: '{{ item.ssh_key_generate | default(omit) }}'
group: >
'{{ omit if item.group is defined and item.group == item.username
else (item.group if item.group is defined else omit) }}'
groups: >
"{{ item.groups|join(',') if item.groups is defined
else users_groups|join(',') }}"
group: '{{ omit if item.group is defined and item.group == item.username else (item.group if item.group is defined else omit) }}'
groups: "{{ item.groups|join(',') if item.groups is defined else users_groups|join(',') }}"
append: '{{ item.append | default(omit) }}'
password: "{{ item.password | default(lookup('password')) }}"
ssh_key_file: >
'.ssh/id_{{ item.ssh_key_type | default(users_ssh_key_type) }}'
ssh_key_file: '.ssh/id_{{ item.ssh_key_type | default(users_ssh_key_type) }}'
ssh_key_passphrase: '{{ item.ssh_key_password | default(omit) }}'
ssh_key_bits: '{{ item.ssh_key_bits | default(users_ssh_key_bits) }}'
createhome: '{{ item.home_create | default(omit) }}'
Expand All @@ -38,9 +33,7 @@
dest: "{{ item.home | default(users_home ~ '/' ~ item.username) }}"
owner: '{{ item.username }}'
group: '{{ item.group if item.group is defined else item.username }}'
mode: >
'{{ item.home_mode if item.home_mode
is defined else users_home_mode }}'
mode: '{{ item.home_mode if item.home_mode is defined else users_home_mode }}'
when: item.home_create is not defined or item.home_create
with_items: '{{ users }}'
no_log: >
Expand Down Expand Up @@ -70,9 +63,7 @@
authorized_key:
key: "{{ item.authorized_keys | default([]) | join('\n') }}"
user: '{{ item.username }}'
exclusive: >
'{{ item.authorized_keys_exclusive |
default(users_authorized_keys_exclusive) }}'
exclusive: '{{ item.authorized_keys_exclusive | default(users_authorized_keys_exclusive) }}'
when: item.home_create is not defined or item.home_create
with_items: '{{ users }}'
no_log: >
Expand Down
4 changes: 2 additions & 2 deletions tasks/distribution/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
account_disabled: "{{ item.account_disabled | default('false') }}"
groups_action: "{{ item.groups_action | default('replace') }}"
account_locked: "{{ item.account_locked | default('false') }}"
password_never_expires: '{{ item.password_never_expires | default(omit) }}'
password_never_expires: "{{ item.password_never_expires | default('true') }}"
update_password: "{{ item.update_password | default('on_create') }}"
password_expired: "{{ item.password_expired | default('false') }}"
user_cannot_change_password: '{{ item.user_cannot_change_password | default(omit) }}'
user_cannot_change_password: '{{ item.user_cannot_change_password | default(false) }}'
no_log: '{{ true if item.password is defined else false }}'
with_items: '{{ users }}'

Expand Down

0 comments on commit 96bfbdc

Please sign in to comment.