From 1c58800a21a87f9ce14fe3e5d25524a6689db2cc Mon Sep 17 00:00:00 2001 From: Maxim Vershinin Date: Mon, 17 Aug 2026 13:31:59 +0400 Subject: [PATCH] CHANGE: replaces explicit username with a variable --- inventory/group_vars/all/main.yaml | 1 + roles/human_admin_user/tasks/main.yaml | 30 +++++++++++++------------- roles/update_configs/tasks/nvim.yaml | 8 +++---- roles/update_configs/tasks/omz.yaml | 6 +++--- roles/update_configs/tasks/ranger.yaml | 14 ++++++------ roles/update_configs/tasks/vim.yaml | 6 +++--- 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/inventory/group_vars/all/main.yaml b/inventory/group_vars/all/main.yaml index 8e4ba15..2fdf97c 100644 --- a/inventory/group_vars/all/main.yaml +++ b/inventory/group_vars/all/main.yaml @@ -1,3 +1,4 @@ --- ansible_become_passwd: "{{ ansible_password }}" +human_admin_user: max diff --git a/roles/human_admin_user/tasks/main.yaml b/roles/human_admin_user/tasks/main.yaml index fdb55ae..3391a6f 100644 --- a/roles/human_admin_user/tasks/main.yaml +++ b/roles/human_admin_user/tasks/main.yaml @@ -2,7 +2,7 @@ - name: Create a new user with a password, set shell remote_user: ansible ansible.builtin.user: - name: max + name: "{{ human_admin_user }}" groups: sshusers,sudo password: "{{ user_passwd_hash }}" shell: /bin/zsh @@ -10,7 +10,7 @@ - name: Set authorized key taken from file remote_user: ansible ansible.posix.authorized_key: - user: max + user: "{{ human_admin_user }}" state: present key: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/ansible_key.pub') }}" @@ -18,15 +18,15 @@ remote_user: ansible ansible.builtin.copy: src: "{{ role_path }}/files/install_omz.sh" - dest: /home/max/install_omz.sh - owner: max - group: max + dest: "/home/{{ human_admin_user }}/install_omz.sh" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rwx,g=r,o-rwx # WARNING: UNPRIVILEGED USER (not ansible) COMMANDS - name: Install oh my zsh - remote_user: max - ansible.builtin.command: /home/max/install_omz.sh + remote_user: "{{ human_admin_user }}" + ansible.builtin.command: "/home/{{ human_admin_user }}/install_omz.sh" changed_when: true vars: @@ -34,18 +34,18 @@ remote_user: ansible ansible.builtin.copy: src: "{{ role_path }}/files/.zshrc" - dest: /home/max/.zshrc - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.zshrc" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx - name: Configure vim, by pushing the config remote_user: ansible ansible.builtin.copy: src: "{{ role_path }}/files/.vimrc" - dest: /home/max/.vimrc - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.vimrc" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx @@ -54,13 +54,13 @@ - name: Set authorized key taken from file remote_user: ansible ansible.posix.authorized_key: - user: max + user: "{{ human_admin_user }}" state: absent key: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/ansible_key.pub') }}" - name: Set authorized key taken from file remote_user: ansible ansible.posix.authorized_key: - user: max + user: "{{ human_admin_user }}" state: present key: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/max_regular_key.pub') }}" diff --git a/roles/update_configs/tasks/nvim.yaml b/roles/update_configs/tasks/nvim.yaml index d7b9d94..82fa28d 100644 --- a/roles/update_configs/tasks/nvim.yaml +++ b/roles/update_configs/tasks/nvim.yaml @@ -3,12 +3,12 @@ - name: Clear old Neovim config ansible.builtin.file: state: absent - path: /home/max/.config/nvim + path: "/home/{{ human_admin_user }}/.config/nvim" - name: Configure neovim, by pushing the config ansible.builtin.copy: src: "{{ role_path }}/files/nvim_config/" - dest: /home/max/.config/nvim - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.config/nvim" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx diff --git a/roles/update_configs/tasks/omz.yaml b/roles/update_configs/tasks/omz.yaml index dd58da7..72fb141 100644 --- a/roles/update_configs/tasks/omz.yaml +++ b/roles/update_configs/tasks/omz.yaml @@ -2,7 +2,7 @@ - name: Configure oh my zsh, by pushing the config file ansible.builtin.copy: src: "{{ role_path }}/files/.zshrc" - dest: /home/max/.zshrc - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.zshrc" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx diff --git a/roles/update_configs/tasks/ranger.yaml b/roles/update_configs/tasks/ranger.yaml index d53538e..2428239 100644 --- a/roles/update_configs/tasks/ranger.yaml +++ b/roles/update_configs/tasks/ranger.yaml @@ -3,20 +3,20 @@ - name: Clear old config ansible.builtin.file: state: absent - path: /home/max/.config/ranger + path: "/home/{{ human_admin_user }}/.config/ranger" - name: Configure ranger, by pushing the config ansible.builtin.copy: src: "{{ role_path }}/files/ranger_config/" - dest: /home/max/.config/ranger - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.config/ranger" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx - name: Make sure ~/.config/ranger/scope.sh is executable ansible.builtin.file: - path: /home/max/.config/ranger/scope.sh - owner: max - group: max + path: "/home/{{ human_admin_user }}/.config/ranger/scope.sh" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rwx,g=rx,o-rwx diff --git a/roles/update_configs/tasks/vim.yaml b/roles/update_configs/tasks/vim.yaml index 5ee76d9..9089e8c 100644 --- a/roles/update_configs/tasks/vim.yaml +++ b/roles/update_configs/tasks/vim.yaml @@ -3,8 +3,8 @@ - name: Configure vim, by pushing the config ansible.builtin.copy: src: "{{ role_path }}/files/.vimrc" - dest: /home/max/.vimrc - owner: max - group: max + dest: "/home/{{ human_admin_user }}/.vimrc" + owner: "{{ human_admin_user }}" + group: "{{ human_admin_user }}" mode: u=rw,g=r,o-rwx