diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-04-29 14:33:46 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-04-29 14:33:46 +0200 |
| commit | 7f276750f154d5ab1609ad8d9f3e46ead3afbcab (patch) | |
| tree | 9c063508d58525f72f26382cb429c8ec688c468c /roles | |
| parent | fix copy/paste error and enable non-free-firmware for kali (diff) | |
fix users role variables
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/core/users/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/core/users/vars/Debian.yml | 2 | ||||
| -rw-r--r-- | roles/core/users/vars/OpenBSD.yml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/core/users/tasks/main.yml b/roles/core/users/tasks/main.yml index 43fe92f4..847711ab 100644 --- a/roles/core/users/tasks/main.yml +++ b/roles/core/users/tasks/main.yml @@ -25,7 +25,7 @@ name: "{{ item }}" state: present password: "{{ hostvars[inventory_hostname]['vault_user_password_'+item] }}" ## TODO: find nicer way to do this - shell: "{{ users[item].shell | default(admin_users_default_shell) }}" + shell: "{{ users[item].shell | default(users_default_shell) }}" - name: add admin users loop: "{{ admin_users }}" @@ -35,7 +35,7 @@ password: "{{ hostvars[inventory_hostname]['vault_user_password_'+item] }}" ## TODO: find nicer way to do this groups: "{{ admin_users_groups }}" append: yes - shell: "{{ users[item].shell | default(admin_users_default_shell) }}" + shell: "{{ users[item].shell | default(users_default_shell) }}" - name: install ssh keys for users loop: "{{ normal_users | union(admin_users) }}" diff --git a/roles/core/users/vars/Debian.yml b/roles/core/users/vars/Debian.yml index af8d20ca..a32441fc 100644 --- a/roles/core/users/vars/Debian.yml +++ b/roles/core/users/vars/Debian.yml @@ -1,5 +1,5 @@ --- -admin_users_default_shell: /bin/zsh +users_default_shell: /bin/zsh admin_users_groups: - sudo - adm diff --git a/roles/core/users/vars/OpenBSD.yml b/roles/core/users/vars/OpenBSD.yml index a1d958d6..6a678ef1 100644 --- a/roles/core/users/vars/OpenBSD.yml +++ b/roles/core/users/vars/OpenBSD.yml @@ -1,4 +1,4 @@ --- -admin_users_default_shell: /usr/local/bin/zsh +users_default_shell: /usr/local/bin/zsh admin_users_groups: - wheel |