From 8839f06bd5bc069d3c4715a77209e511ee7e32fa Mon Sep 17 00:00:00 2001 From: mrwho Date: Tue, 2 Jun 2026 23:27:46 +0300 Subject: [PATCH] fix --- .vscode/settings.json | 3 +++ .../__pycache__/ipaddr.cpython-312.pyc | Bin 0 -> 249 bytes inventory/prod/group_vars/all/users.yml | 12 +++++----- playbooks/deploy_users.yml | 4 ++-- playbooks/mrwho/add-user.yml | 17 ++++++++++++++ roles/users/tasks/main.yml | 22 +++++++++--------- 6 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 filter_plugins/__pycache__/ipaddr.cpython-312.pyc create mode 100644 playbooks/mrwho/add-user.yml diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c9ebf2d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python-envs.defaultEnvManager": "ms-python.python:system" +} \ No newline at end of file diff --git a/filter_plugins/__pycache__/ipaddr.cpython-312.pyc b/filter_plugins/__pycache__/ipaddr.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7c8edd0297506b90bd87dd251c361fbac513c035 GIT binary patch literal 249 zcmX@j%ge<81OXQRGUI{tV-N=hn4pZ$0zk%eh7^Vr#vF!R#wbQchDs()=9eI8O~zY1 zZkahHsYSl|DWy57ews|T%oFp9Gm~;sC$(4~ sqBkCDls?1^y@JYH95%UNx7ZbN08L^9;$jfv12ZEd<2{CeA~qlg02vua4FCWD literal 0 HcmV?d00001 diff --git a/inventory/prod/group_vars/all/users.yml b/inventory/prod/group_vars/all/users.yml index 2279a88..e6d3b44 100644 --- a/inventory/prod/group_vars/all/users.yml +++ b/inventory/prod/group_vars/all/users.yml @@ -9,14 +9,14 @@ users_admin_groups: super_admin: - - username: s.lebed - ssh_key: >- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChuu3tibT89C77sjX19kqqfr3qqM1eknqipnvZzd23cZTn8ULyWLLmOSYiEuOP5fcz55PVOpe8k8eBC+JvCu+/W1XdPH/q7GCL00b0ANcMKMZHvi/zjFSZj7NoFeypVF4/dutTWudpftFdmfJdHt5wyFs37cVNc4WWbNSASQBHhzR3GSdq7h5H5Ed0ua6AIFNR9Mt0rFI5JYbMaU/mO5WvvrlIq4T1X1zpHUDPloFXmnWd+WPuGPR7ecHP0mmXYSoWDCjEBexCUiAPb9BhR7dbe9lDjWwDB3J9daKXQ9rFpZ6f91DyD6sImarJSmTYXHnAn3u/Hj3IW5TYW4XMypob+NIRa3o7Zuu0rZ2uqwFdSxe9sOJHkgxTxwnJpBxRsQCpAl4uyGGOmTUiYDY7rK86zk1e4xetwt7DS16WOqdrBSNw6sKmvAtkcxacmbOO68+ixmWERpbFXuJtuCQodOtgf+vGUbXASJ1RQtmrBP0qKbV+MYqMOLP1RPA6UUeYssA/lG0uO4u7xxAW30MExZjeETgzGONbSBshqwFt09aXYs57Esp+kn4cFYcYkhvbPeicFiaCwQ4RWd+iAryd6KFNFrc0o0TuqbwE+3Dba2dU3P2KQ+nVIYGeDs62OyYV0yCN0ZEHDzkJAsbqNMDVpwCv4YdZdg0iB40aednRzNYv3Q== s.lebed@gigacoms.ru - - - username: a.kazantsev + - username: mrwho # Note: key comment says a.kazantsev — verify the key owner if needed ssh_key: >- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClB+roxcr/POfhJVq3jFIzZD36nRVhfYq9WaQBr6o2RvMHM+B/2yRM8OeN6jhhYYFB8z7X5o8j1/ZC2u/80LLJtEQ0s8DCb4l4Ie7IY3POBYlmwtvlnhNFsGlKoAoQr0jpPUwMiV7wdBtHYCqHJM69+VpWCnqOkI+hrdj5oxSm26g6AKL0lm9AJO8KnbIpUCHgnQ3EcPcfQE7OpspVP6nbp4SwipJbnG4yYeKB6l77ESUdCkgwwLCv4DCpxJ846J9aN39Bu273hmEoO6+Bw0wAPRruLp5/AzPni7frcncdGuPfOmi+RAoOsRqoO/c122soAbQn3074QtEKwuC+zFKH a.kazantsev@gigacoms.ru + ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAlQz8IhTEQ0utmWmwOC7FijieQULbeyXLDkjmYwSyptqj+7u0qyPPStQzN9leIISSKJ1/eJ5UbETTvc1R1Jg1tdTg5xZTMoz0jwruDP73vYIxLdeO4cZvjJIGyzS2PemUM+016uf4DLZ3jmK4hwEi2mF6UX+NYRPNIuPpr96gP1kYb1vrlG7P0cEk7EbGO6Deda3S64L0lDherSqc/Z7cn8nr6iemTdsBfl303vqFgXf/aWijuvVPUSpSiI3fR0NwvX/RW7oDIFls1dVU5CPkcwaX25Fu3voJ6e3lmduW+1s/vL1nMd5ourET+1Std3S75jqzkVsV3R74Xkgq5avn7w== + - username: m.kudryashov + ssh_key: >- + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvaPsU1iT306USihvyYYVEdmr2CjLAaSUxyQy1QSEqF + middle_admin: [] diff --git a/playbooks/deploy_users.yml b/playbooks/deploy_users.yml index 1378ff6..4ef5ed8 100644 --- a/playbooks/deploy_users.yml +++ b/playbooks/deploy_users.yml @@ -4,8 +4,8 @@ # Ограничить одной группой хостов: # ansible-playbook -i inventory/prod playbooks/users.yml --limit centos - name: Provision admin users - hosts: all - gather_facts: true + hosts: vm01 + gather_facts: false become: true roles: diff --git a/playbooks/mrwho/add-user.yml b/playbooks/mrwho/add-user.yml new file mode 100644 index 0000000..9a9d81e --- /dev/null +++ b/playbooks/mrwho/add-user.yml @@ -0,0 +1,17 @@ +--- +- name: Provision admin users + hosts: vm01 + gather_facts: false + become: true + + tasks: + - name: Create users + ansible.builtin.user: + name: m.kudryashov + state: present + + - name: Add SSH key + ansible.posix.authorized_key: + user: m.kudryashov + state: present + key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvaPsU1iT306USihvyYYVEdmr2CjLAaSUxyQy1QSEqF" diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 15672f2..f6a2aca 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -16,18 +16,18 @@ msg: "Managing users: {{ users_managed_users | map(attribute='username') | list }}" # ── Необходимые пакеты ──────────────────────────────────────────────────────── -- name: Update apt cache (Debian/Ubuntu) - ansible.builtin.apt: - update_cache: true - cache_valid_time: 3600 - when: ansible_os_family == "Debian" - failed_when: false +#- name: Update apt cache (Debian/Ubuntu) +# ansible.builtin.apt: +# update_cache: true +# cache_valid_time: 3600 +# when: ansible_os_family == "Debian" +# failed_when: false -- name: Ensure sudo package is present (Debian/Ubuntu) - ansible.builtin.apt: - name: sudo - state: present - when: ansible_os_family == "Debian" +#- name: Ensure sudo package is present (Debian/Ubuntu) +# ansible.builtin.apt: +# name: sudo +# state: present +# when: ansible_os_family == "Debian" # ── Учётные записи пользователей ────────────────────────────────────────────── - name: Ensure user accounts exist