Merge pull request 'evolinux-users: Only create a subset of users' (#162) from P10077 into unstable
All checks were successful
gitea/ansible-roles/pipeline/head This commit looks good
All checks were successful
gitea/ansible-roles/pipeline/head This commit looks good
Reviewed-on: #162
This commit is contained in:
commit
a12f68fb87
|
@ -12,6 +12,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
* evolinux_users: create only users who have a certain value for the `create` key (default: `always`).
|
||||||
* php: install php-xml with recent PHP versions
|
* php: install php-xml with recent PHP versions
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
|
@ -19,6 +19,7 @@ evolinux_users:
|
||||||
groups: "baz"
|
groups: "baz"
|
||||||
password_hash: 'sdfgsdfgsdfgsdfg'
|
password_hash: 'sdfgsdfgsdfgsdfg'
|
||||||
ssh_key: 'ssh-rsa AZERTYXYZ'
|
ssh_key: 'ssh-rsa AZERTYXYZ'
|
||||||
|
create: always
|
||||||
bar:
|
bar:
|
||||||
name: bar
|
name: bar
|
||||||
uid: 1002
|
uid: 1002
|
||||||
|
@ -30,6 +31,7 @@ evolinux_users:
|
||||||
ssh_keys:
|
ssh_keys:
|
||||||
- 'ssh-rsa QWERTYUIOP'
|
- 'ssh-rsa QWERTYUIOP'
|
||||||
- 'ssh-ed25519 QWERTYUIOP'
|
- 'ssh-ed25519 QWERTYUIOP'
|
||||||
|
create: on_demand
|
||||||
```
|
```
|
||||||
|
|
||||||
* `evolinux_sudo_group`: which group to use for sudo (default: `evolinux-sudo`)
|
* `evolinux_sudo_group`: which group to use for sudo (default: `evolinux-sudo`)
|
||||||
|
|
|
@ -6,3 +6,6 @@ evolinux_ssh_group: "evolinux-ssh"
|
||||||
evolinux_internal_group: ""
|
evolinux_internal_group: ""
|
||||||
|
|
||||||
evolinux_root_disable_ssh: True
|
evolinux_root_disable_ssh: True
|
||||||
|
|
||||||
|
# Defines which groups of users are created
|
||||||
|
evolinux_users_create: always
|
|
@ -16,7 +16,9 @@
|
||||||
vars:
|
vars:
|
||||||
user: "{{ item.value }}"
|
user: "{{ item.value }}"
|
||||||
loop: "{{ evolinux_users | dict2items }}"
|
loop: "{{ evolinux_users | dict2items }}"
|
||||||
when: evolinux_users | length > 0
|
when:
|
||||||
|
- user.create == evolinux_users_create
|
||||||
|
- evolinux_users | length > 0
|
||||||
|
|
||||||
- name: Configure sudo
|
- name: Configure sudo
|
||||||
include: sudo.yml
|
include: sudo.yml
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
user: "{{ item.value }}"
|
user: "{{ item.value }}"
|
||||||
loop: "{{ evolinux_users | dict2items }}"
|
loop: "{{ evolinux_users | dict2items }}"
|
||||||
when:
|
when:
|
||||||
|
- user.create == evolinux_users_create
|
||||||
- ssh_allowusers
|
- ssh_allowusers
|
||||||
- not ssh_allowgroups
|
- not ssh_allowgroups
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
loop: "{{ evolinux_users | dict2items }}"
|
loop: "{{ evolinux_users | dict2items }}"
|
||||||
when:
|
when:
|
||||||
- evolinux_users | length > 0
|
- evolinux_users | length > 0
|
||||||
|
- user.create == evolinux_users_create
|
||||||
- ansible_distribution_release == "jessie"
|
- ansible_distribution_release == "jessie"
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,6 +17,9 @@
|
||||||
vars:
|
vars:
|
||||||
user: "{{ item.value }}"
|
user: "{{ item.value }}"
|
||||||
loop: "{{ evolinux_users | dict2items }}"
|
loop: "{{ evolinux_users | dict2items }}"
|
||||||
|
when:
|
||||||
|
- evolinux_users | length > 0
|
||||||
|
- user.create == evolinux_users_create
|
||||||
when:
|
when:
|
||||||
- ansible_distribution_major_version is defined
|
- ansible_distribution_major_version is defined
|
||||||
- ansible_distribution_major_version is version('9', '>=')
|
- ansible_distribution_major_version is version('9', '>=')
|
||||||
|
|
Loading…
Reference in a new issue