Skip to content

Commit 87c31d6

Browse files
committed
fix
1 parent 5ed218c commit 87c31d6

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

README.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ Ansible role which manages the groups and user accounts.
1212
```yaml
1313
genericusers_groups:
1414
- name: "dbadmins"
15+
gid: 5000
16+
system: no
1517
- name: "mailadmins"
18+
gid: 6000
19+
system: no
1620

1721
genericusers_groups_removed:
1822
- name: "defunctadmins"
@@ -23,12 +27,12 @@ genericusers_users:
2327
ssh_keys:
2428
- "ssh-dss ......."
2529
- "ssh-dss ......."
26-
append: "no" # (optional) If yes, will only add groups, not set them to just the list in groups.
27-
pass: "$6$...." # (Optional) Set the user's password to this crypted value.
28-
comment: "foo acc" # (Optional)
29-
shell: "/bin/bash" # (Optional) Set the user's shell.
30-
home: "/home/baz" # (Optional) Set the user's home directory.
31-
system: no # (Optional) Make the user a system account or not.
30+
append: "no" # If yes, will only add groups, not set them to just the list in groups.
31+
pass: "$6$...." # Set the user's password to this crypted value.
32+
comment: "foo acc" #
33+
shell: "/bin/bash" # Set the user's shell.
34+
home: "/home/baz" # Set the user's home directory.
35+
system: no # Make the user a system account or not.
3236
- name: "bar"
3337
groups: ["admin", "staff", "dev"]
3438
ssh_keys: []

tasks/main.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# file: generic-users/tasks/main.yml
22

33
- name: generic-users | Make sure all groups are present
4-
group: name={{item.name}}{% if item.system is defined %} {{item.system}}{% endif %}{% if item.gid is defined %} gid={{item.gid}}{% endif %} state=present
5-
with_items: genericusers_groups
4+
group: name="{{item.name}}"{% if item.system is defined %} system="{{item.system}}"{% endif %}{% if item.gid is defined %} gid="{{item.gid}}"{% endif %} state=present
5+
with_items: "{{ genericusers_groups }}"
66

77
- name: generic-users | Make sure all removed groups are not present
8-
group: name={{item.name}} state=absent
9-
with_items: genericusers_groups_removed
8+
group: name="{{item.name}}" state=absent
9+
with_items: "{{ genericusers_groups_removed }}"
1010

1111
- name: generic-users | Make sure the users are present
12-
user: name={{item.name}} groups={{",".join(item.groups)}}{% if item.append is defined %} append={{item.append}}{% endif %}{% if item.pass is defined %} password={{item.pass}}{% endif %}{% if item.comment is defined %} comment='{{item.comment}}'{% endif %}{% if item.shell is defined %} shell={{item.shell}}{% endif %}{% if item.uid is defined %} uid={{item.uid}}{% endif %}{% if item.home is defined %} home={{item.home}}{% endif %}{% if item.system is defined %} system={{item.system}}{% endif %} state=present
13-
with_items: genericusers_users
12+
user: name="{{item.name}}" groups="{{','.join(item.groups)}}"{% if item.append is defined %} append="{{item.append}}"{% endif %}{% if item.pass is defined %} password="{{item.pass}}"{% endif %}{% if item.comment is defined %} comment='"{{item.comment}}"'{% endif %}{% if item.shell is defined %} shell="{{item.shell}}"{% endif %}{% if item.uid is defined %} uid="{{item.uid}}"{% endif %}{% if item.home is defined %} home="{{item.home}}"{% endif %}{% if item.system is defined %} system="{{item.system}}"{% endif %} state=present
13+
with_items: "{{ genericusers_users }}"
1414

1515
- name: generic-users | Make sure all removed groups are not present
16-
user: name={{item.name}} state=absent remove=yes
17-
with_items: genericusers_users_removed
16+
user: name="{{item.name}}" state=absent remove=yes
17+
with_items: "{{ genericusers_users_removed }}"
1818

1919
- name: generic-users | Install the ssh keys for the users
20-
authorized_key: "user={{item.0.name}} key='{{item.1}}'"
20+
authorized_key: "user='{{item.0.name}}' key='{{item.1}}'"
2121
with_subelements:
2222
- genericusers_users
2323
- ssh_keys

0 commit comments

Comments
 (0)