refactor: перейти на ansible.posix.authorized_key, очищать ключ раннера и поддержать внешние секреты
This commit is contained in:
1 parent
7ff2b00d27
commit
69e098415b
4 files changed
+12
-11
No files matched your search
@@ -47,8 +47,10 @@ jobs:
|
|||||||
install -d -m 700 "${HOME}/.ssh"
|
install -d -m 700 "${HOME}/.ssh"
|
||||||
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
|
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
|
||||||
chmod 600 "${HOME}/.ssh/id_ed25519"
|
chmod 600 "${HOME}/.ssh/id_ed25519"
|
||||||
|
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
||||||
|
|
||||||
cd "${HOME}/homelab-infra"
|
cd "${HOME}/homelab-infra"
|
||||||
|
ansible-galaxy collection install -r requirements.yml
|
||||||
|
|
||||||
ansible-playbook playbooks/site.yml \
|
ansible-playbook playbooks/site.yml \
|
||||||
-i inventories/prod/hosts.yml \
|
-i inventories/prod/hosts.yml \
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
collections:
|
||||||
|
- name: ansible.posix
|
||||||
@@ -15,14 +15,10 @@
|
|||||||
mode: "0700"
|
mode: "0700"
|
||||||
|
|
||||||
- name: Добавить авторизованные SSH-ключи
|
- name: Добавить авторизованные SSH-ключи
|
||||||
ansible.builtin.lineinfile:
|
ansible.posix.authorized_key:
|
||||||
path: /root/.ssh/authorized_keys
|
user: root
|
||||||
line: "{{ item }}"
|
key: "{{ item }}"
|
||||||
state: present
|
state: present
|
||||||
create: true
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: "0600"
|
|
||||||
loop: "{{ host_authorized_keys }}"
|
loop: "{{ host_authorized_keys }}"
|
||||||
|
|
||||||
- name: Удалить cloud-init настройки пароля SSH
|
- name: Удалить cloud-init настройки пароля SSH
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
- auth
|
- auth
|
||||||
- datastore
|
- datastore
|
||||||
- session
|
- session
|
||||||
when: not netbird_env.stat.exists
|
when: not netbird_env.stat.exists and netbird_auth_secret is not defined
|
||||||
|
|
||||||
- name: Запомнить новые ключи
|
- name: Запомнить новые ключи
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
@@ -50,14 +50,14 @@
|
|||||||
netbird_datastore_key: "{{ netbird_generated_keys.results[1].stdout }}"
|
netbird_datastore_key: "{{ netbird_generated_keys.results[1].stdout }}"
|
||||||
netbird_session_key: "{{ netbird_generated_keys.results[2].stdout }}"
|
netbird_session_key: "{{ netbird_generated_keys.results[2].stdout }}"
|
||||||
no_log: true
|
no_log: true
|
||||||
when: not netbird_env.stat.exists
|
when: not netbird_env.stat.exists and netbird_auth_secret is not defined
|
||||||
|
|
||||||
- name: Прочитать сохранённые ключи
|
- name: Прочитать сохранённые ключи
|
||||||
ansible.builtin.slurp:
|
ansible.builtin.slurp:
|
||||||
src: "{{ netbird_dir }}/.env"
|
src: "{{ netbird_dir }}/.env"
|
||||||
register: netbird_env_raw
|
register: netbird_env_raw
|
||||||
no_log: true
|
no_log: true
|
||||||
when: netbird_env.stat.exists
|
when: netbird_env.stat.exists and netbird_auth_secret is not defined
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
env_lines: "{{ (netbird_env_raw.content | b64decode).splitlines() | reject('equalto', '') | list }}"
|
env_lines: "{{ (netbird_env_raw.content | b64decode).splitlines() | reject('equalto', '') | list }}"
|
||||||
env_map: "{{ dict(env_lines | map('split', '=', 1)) }}"
|
env_map: "{{ dict(env_lines | map('split', '=', 1)) }}"
|
||||||
no_log: true
|
no_log: true
|
||||||
when: netbird_env.stat.exists
|
when: netbird_env.stat.exists and netbird_auth_secret is not defined
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user