From 8955762fd20daffdf8ef50f2d9214c2b93de6e3e Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:43:47 +0100 Subject: [PATCH 01/12] typo and quoting --- roles/base/tasks/users/all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index 338f20e..c206538 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -11,9 +11,9 @@ - name: users | {{ user }} | install private ssh keys become: True - become_user: "{{ user }}" + become_user: '{{ user }}' copy: - dest: "{{ lokup('env','HOME') }}/.ssh/" + dest: "{{ lookup('env','HOME') }}/.ssh/" src: '{{ item }}' owner: '{{ user }}' group: '{{ user }}' @@ -23,7 +23,7 @@ - name: users | {{ user }} | install known_hosts become: True - become_user: "{{ user }}" + become_user: '{{ user }}' copy: dest: "{{ lookup('env','HOME') }}/.ssh/known_hosts" src: "users/known_hosts" @@ -37,7 +37,7 @@ become_user: '{{ user }}' git: repo: '{{ item.repo }}' - dest: '{{ lookup('env','HOME') }}/{{ item.dir }}' + dest: "{{ lookup('env','HOME') }}/{{ item.dir }}" key_file: '{{ lookup('env','HOME') }}/.ssh/gitlab_read_ed25519' with_items: - {repo: 'ssh://git@gitlab.social.my-wan.de:22422/rene/dotfiles.git', dir: 'dotfiles'} From a1573d7657de4a69fe26a6a39cb27e4ff5aa0c0c Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:47:10 +0100 Subject: [PATCH 02/12] quoting --- roles/base/tasks/users/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index c206538..b42cda0 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -38,7 +38,7 @@ git: repo: '{{ item.repo }}' dest: "{{ lookup('env','HOME') }}/{{ item.dir }}" - key_file: '{{ lookup('env','HOME') }}/.ssh/gitlab_read_ed25519' + key_file: "{{ lookup('env','HOME') }}/.ssh/gitlab_read_ed25519" with_items: - {repo: 'ssh://git@gitlab.social.my-wan.de:22422/rene/dotfiles.git', dir: 'dotfiles'} - {repo: 'https://github.com/romkatv/powerlevel10k.git', dir: 'powerlevel10k'} From 480615606286244349290c098d3f5ea235912dd1 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:52:23 +0100 Subject: [PATCH 03/12] renamed task --- roles/base/tasks/users/rene.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/base/tasks/users/rene.yml b/roles/base/tasks/users/rene.yml index 15fc764..af0f27f 100644 --- a/roles/base/tasks/users/rene.yml +++ b/roles/base/tasks/users/rene.yml @@ -1,4 +1,4 @@ -- name: users | rene | ensure account is locked +- name: users | rene | set shell user: name: rene shell: "/usr/bin/zsh" From 247d901e9d2c7aeb7d060eb00a83f3c878543ac9 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:52:32 +0100 Subject: [PATCH 04/12] added some debugging --- roles/base/tasks/users/all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index b42cda0..a4b60e1 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -20,6 +20,8 @@ mode: '0600' loop: - "private_keys/gitlab_read_ed25519" + debug: + msg: "user={{ user }}; home={{ lookup('env','HOME') }}" - name: users | {{ user }} | install known_hosts become: True From 0d41cbcd20fc4b5c90a4e4af1b3b189c6f98adcf Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:54:26 +0100 Subject: [PATCH 05/12] moved debug --- roles/base/tasks/users/all.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index a4b60e1..aa5516a 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -1,3 +1,7 @@ +- name: users | {{ user }} | debug + debug: + msg: "user={{ user }}; home={{ lookup('env','HOME') }}" + - name: users | {{ user }} | install public ssh keys authorized_key: user: '{{ user }}' @@ -20,8 +24,6 @@ mode: '0600' loop: - "private_keys/gitlab_read_ed25519" - debug: - msg: "user={{ user }}; home={{ lookup('env','HOME') }}" - name: users | {{ user }} | install known_hosts become: True From 16333d4fc03786de08041dee7dbe35332e75e87e Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 20 Feb 2022 23:56:02 +0100 Subject: [PATCH 06/12] added become_user to debug --- roles/base/tasks/users/all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index aa5516a..8590786 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -1,4 +1,6 @@ - name: users | {{ user }} | debug + become: True + become_user: "{{ user }}" debug: msg: "user={{ user }}; home={{ lookup('env','HOME') }}" From 8c8e5168efb59f6d68c5682f893ebdac5e0141d8 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:03:49 +0100 Subject: [PATCH 07/12] test with registered vars and nesting vars --- roles/base/tasks/users/root.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/base/tasks/users/root.yml b/roles/base/tasks/users/root.yml index 64f4862..a923e4f 100644 --- a/roles/base/tasks/users/root.yml +++ b/roles/base/tasks/users/root.yml @@ -2,6 +2,7 @@ user: name: root password_lock: yes + register: root_registered # - name: users | root | install public ssh keys # authorized_key: From ccbb00970cc9abbfade22fdd8a9792caad3c0a52 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:04:01 +0100 Subject: [PATCH 08/12] test with registered vars and nesting vars --- roles/base/tasks/users/all.yml | 2 +- roles/base/tasks/users/ansible.yml | 1 + roles/base/tasks/users/rene.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index 8590786..6373ee3 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -2,7 +2,7 @@ become: True become_user: "{{ user }}" debug: - msg: "user={{ user }}; home={{ lookup('env','HOME') }}" + msg: "user={{ user }}; home={{ {{ user }}_registered.home }}" - name: users | {{ user }} | install public ssh keys authorized_key: diff --git a/roles/base/tasks/users/ansible.yml b/roles/base/tasks/users/ansible.yml index b315f86..60785fe 100644 --- a/roles/base/tasks/users/ansible.yml +++ b/roles/base/tasks/users/ansible.yml @@ -4,6 +4,7 @@ comment: Ansible-Pull user shell: /bin/bash password_lock: yes + register: ansible_registered - name: users | ansible | add sudoers file copy: diff --git a/roles/base/tasks/users/rene.yml b/roles/base/tasks/users/rene.yml index af0f27f..b81b3b3 100644 --- a/roles/base/tasks/users/rene.yml +++ b/roles/base/tasks/users/rene.yml @@ -2,6 +2,7 @@ user: name: rene shell: "/usr/bin/zsh" + register: rene_registered # - name: users | rene | install public ssh keys # authorized_key: From a5546e48f3ffb9be1739a5b7387802ed350c5c15 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:09:31 +0100 Subject: [PATCH 09/12] further testing --- roles/base/tasks/users/all.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index 6373ee3..a1c01a9 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -1,8 +1,10 @@ - name: users | {{ user }} | debug become: True become_user: "{{ user }}" + vars: + registered_user: "{{ user }}_registered" debug: - msg: "user={{ user }}; home={{ {{ user }}_registered.home }}" + msg: "user={{ user }}; home={{ registered_user.home }}" - name: users | {{ user }} | install public ssh keys authorized_key: From 0ee6e3999230b127a3b175120dd3f25db31b4151 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:28:41 +0100 Subject: [PATCH 10/12] further testing --- roles/base/tasks/users/all.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index a1c01a9..0d4ac75 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -1,10 +1,11 @@ - name: users | {{ user }} | debug - become: True - become_user: "{{ user }}" - vars: - registered_user: "{{ user }}_registered" + getent: + database: passwd + key: "{{ user }}" + split: ":" + fail_key: no # not required. If a supplied key is missing this will make the task fail if C(yes). debug: - msg: "user={{ user }}; home={{ registered_user.home }}" + msg: "user: "{{ user }}; homedir: {{ getent_passwd[user][4] }}" - name: users | {{ user }} | install public ssh keys authorized_key: From e9321f3d30c15d76939042a34e6bc6b5fc58d186 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:30:16 +0100 Subject: [PATCH 11/12] quoting, what else --- roles/base/tasks/users/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index 0d4ac75..69cf82d 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -5,7 +5,7 @@ split: ":" fail_key: no # not required. If a supplied key is missing this will make the task fail if C(yes). debug: - msg: "user: "{{ user }}; homedir: {{ getent_passwd[user][4] }}" + msg: "user: {{ user }}; homedir: {{ getent_passwd[user][4] }}" - name: users | {{ user }} | install public ssh keys authorized_key: From d8ee7a76734b583b8500b4c0a3034b097a9a9105 Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 21 Feb 2022 00:43:02 +0100 Subject: [PATCH 12/12] further testing --- roles/base/tasks/users/all.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index 69cf82d..62f098d 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -1,9 +1,10 @@ -- name: users | {{ user }} | debug +- name: users | {{ user }} | getent getent: database: passwd key: "{{ user }}" split: ":" fail_key: no # not required. If a supplied key is missing this will make the task fail if C(yes). +- name: users | {{ user }} | debug debug: msg: "user: {{ user }}; homedir: {{ getent_passwd[user][4] }}"