refactor(remnawave,exit-node): split bootstrap/sync and generalize ger-nod-02 roles
ansible-core-net / deploy (push) Successful in 1m50s
ansible-core-mon / deploy (push) Successful in 28s
ansible-core-secrets / deploy (push) Successful in 18s
ansible-ger-nod-02 / deploy (push) Failing after 3s
ansible-opnsense / deploy (push) Successful in 9s
ansible-rus-central / deploy (push) Successful in 1m7s
ansible-core-net / deploy (push) Successful in 1m50s
ansible-core-mon / deploy (push) Successful in 28s
ansible-core-secrets / deploy (push) Successful in 18s
ansible-ger-nod-02 / deploy (push) Failing after 3s
ansible-opnsense / deploy (push) Successful in 9s
ansible-rus-central / deploy (push) Successful in 1m7s
This commit is contained in:
1 parent
83baec4bad
commit
2fc6e39323
19 files changed
+1092
-863
No files matched your search
@@ -1,297 +1,22 @@
|
||||
---
|
||||
- name: Проверить наличие Infisical CLI-контекста для записи секретов
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- lookup('env', 'INFISICAL_TOKEN') | length > 0
|
||||
- lookup('env', 'INFISICAL_DOMAIN') | length > 0
|
||||
- lookup('env', 'INFISICAL_PROJECT_ID') | length > 0
|
||||
fail_msg: "Для роли remnawave нужны INFISICAL_TOKEN / INFISICAL_DOMAIN / INFISICAL_PROJECT_ID (деплой через deploy-machine.sh)."
|
||||
- name: Развернуть и инициализировать панель Remnawave
|
||||
ansible.builtin.include_tasks: bootstrap.yml
|
||||
|
||||
- name: Проверить имя администратора панели
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- remnawave_admin_username | length > 0
|
||||
fail_msg: "Нужен REMNAWAVE_ADMIN_USER или ADMIN_USER."
|
||||
- name: Синхронизировать ноды, профили, шаблоны и пользователей Remnawave
|
||||
ansible.builtin.include_tasks: sync.yml
|
||||
|
||||
# Remnawave v3: /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{24,}$/
|
||||
- name: Запомнить, какие секреты панели нужно сгенерировать
|
||||
- name: Определить изменившиеся секреты для Infisical
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_need_admin_password: "{{ (remnawave_admin_password | length < 24) or (remnawave_admin_password is not match('^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{24,}$')) }}"
|
||||
remnawave_need_app_secret: "{{ remnawave_app_secret | length == 0 }}"
|
||||
remnawave_need_postgres_password: "{{ remnawave_postgres_password | length == 0 }}"
|
||||
remnawave_need_metrics_pass: "{{ remnawave_metrics_pass | length == 0 }}"
|
||||
remnawave_need_webhook_secret: "{{ remnawave_webhook_secret | length == 0 }}"
|
||||
remnawave_need_node_secret: "{{ lookup('env', 'REMNANODE_SECRET_KEY', default='') | length == 0 }}"
|
||||
|
||||
- name: Сгенерировать отсутствующие секреты панели
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_admin_password: "{{ remnawave_admin_password if not remnawave_need_admin_password else ('Rw9' ~ lookup('password', '/dev/null length=29 chars=ascii_letters,digits')) }}"
|
||||
remnawave_app_secret: "{{ remnawave_app_secret if not remnawave_need_app_secret else lookup('password', '/dev/null length=64 chars=hexdigits') }}"
|
||||
remnawave_postgres_password: "{{ remnawave_postgres_password if not remnawave_need_postgres_password else lookup('password', '/dev/null length=48 chars=hexdigits') }}"
|
||||
remnawave_metrics_pass: "{{ remnawave_metrics_pass if not remnawave_need_metrics_pass else lookup('password', '/dev/null length=64 chars=hexdigits') }}"
|
||||
remnawave_webhook_secret: "{{ remnawave_webhook_secret if not remnawave_need_webhook_secret else lookup('password', '/dev/null length=64 chars=ascii_letters,digits') }}"
|
||||
remnawave_current_xray_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='') }}"
|
||||
remnawave_need_infisical_sync: >-
|
||||
{{
|
||||
(remnawave_bootstrap.token_updated | default(false)) or
|
||||
(remnawave_bootstrap.node_secret_created | default(false)) or
|
||||
((remnawave_xray_checker_url | default('') | length > 0) and (remnawave_xray_checker_url != lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='')))
|
||||
}}
|
||||
no_log: true
|
||||
|
||||
- name: Создать каталоги Remnawave
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
loop:
|
||||
- "{{ remnawave_dir }}"
|
||||
- "{{ remnawave_subscription_dir }}"
|
||||
|
||||
- name: Поставить curl, jq и openssl
|
||||
ansible.builtin.apt:
|
||||
name:
|
||||
- curl
|
||||
- jq
|
||||
- openssl
|
||||
state: present
|
||||
|
||||
- name: Записать .env панели
|
||||
ansible.builtin.template:
|
||||
src: env.j2
|
||||
dest: "{{ remnawave_dir }}/.env"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0600"
|
||||
no_log: true
|
||||
|
||||
- name: Создать папку /services/remnawave в Infisical при необходимости
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
infisical secrets folders create \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
--env=prod \
|
||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||
--path="/services" \
|
||||
--name="remnawave" \
|
||||
--silent 2>/dev/null || true
|
||||
args:
|
||||
executable: /bin/bash
|
||||
delegate_to: localhost
|
||||
become: false
|
||||
environment:
|
||||
INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}"
|
||||
INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}"
|
||||
INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}"
|
||||
changed_when: false
|
||||
|
||||
- name: Сохранить сгенерированные секреты панели в Infisical
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
out=$(infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
--env=prod \
|
||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||
--path="/services/remnawave" \
|
||||
"REMNAWAVE_ADMIN_USER=${RW_ADMIN_USER}" \
|
||||
"REMNAWAVE_ADMIN_PASSWORD=${RW_ADMIN_PASS}" \
|
||||
"REMNAWAVE_APP_SECRET=${RW_APP_SECRET}" \
|
||||
"REMNAWAVE_POSTGRES_PASSWORD=${RW_PG_PASS}" \
|
||||
"REMNAWAVE_METRICS_PASS=${RW_METRICS_PASS}" \
|
||||
"REMNAWAVE_WEBHOOK_SECRET_HEADER=${RW_WEBHOOK}" \
|
||||
--silent 2>&1) || {
|
||||
echo "infisical secrets set failed: ${out}" >&2
|
||||
exit 1
|
||||
}
|
||||
args:
|
||||
executable: /bin/bash
|
||||
delegate_to: localhost
|
||||
become: false
|
||||
environment:
|
||||
INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}"
|
||||
INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}"
|
||||
INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}"
|
||||
RW_ADMIN_USER: "{{ remnawave_admin_username }}"
|
||||
RW_ADMIN_PASS: "{{ remnawave_admin_password }}"
|
||||
RW_APP_SECRET: "{{ remnawave_app_secret }}"
|
||||
RW_PG_PASS: "{{ remnawave_postgres_password }}"
|
||||
RW_METRICS_PASS: "{{ remnawave_metrics_pass }}"
|
||||
RW_WEBHOOK: "{{ remnawave_webhook_secret }}"
|
||||
# Всегда пишем admin+runtime секреты в /services/remnawave (идемпотентно).
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
- name: Записать compose панели
|
||||
ansible.builtin.template:
|
||||
src: compose.yaml.j2
|
||||
dest: "{{ remnawave_dir }}/compose.yaml"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Положить шаблон config profile DE-Yali
|
||||
ansible.builtin.copy:
|
||||
src: profile-de-yali.json
|
||||
dest: "{{ remnawave_dir }}/profile-de-yali.json"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Положить клиентский шаблон Xray Except-RU
|
||||
ansible.builtin.copy:
|
||||
src: xray-except-ru.json
|
||||
dest: "{{ remnawave_dir }}/xray-except-ru.json"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Стянуть образы панели Remnawave
|
||||
ansible.builtin.command: docker compose -f {{ remnawave_dir }}/compose.yaml pull
|
||||
register: remnawave_compose_pull
|
||||
changed_when: remnawave_compose_pull.rc == 0
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: remnawave_compose_pull.rc == 0
|
||||
|
||||
- name: Запустить панель Remnawave
|
||||
ansible.builtin.command: docker compose -f {{ remnawave_dir }}/compose.yaml up -d --remove-orphans
|
||||
register: remnawave_compose_up
|
||||
changed_when: >-
|
||||
'Started' in remnawave_compose_up.stderr or
|
||||
'Created' in remnawave_compose_up.stderr or
|
||||
'Recreated' in remnawave_compose_up.stderr or
|
||||
'Pulled' in remnawave_compose_up.stderr
|
||||
|
||||
- name: Дождаться health панели
|
||||
ansible.builtin.uri:
|
||||
url: "http://127.0.0.1:{{ remnawave_metrics_port }}/health"
|
||||
status_code: 200
|
||||
register: remnawave_health
|
||||
retries: 40
|
||||
delay: 3
|
||||
until: remnawave_health.status == 200
|
||||
|
||||
- name: Дождаться HTTPS панели через Traefik
|
||||
ansible.builtin.command: >
|
||||
curl -fsSk --resolve {{ remnawave_panel_domain }}:443:127.0.0.1
|
||||
https://{{ remnawave_panel_domain }}/api/auth/status
|
||||
register: remnawave_auth_status
|
||||
changed_when: false
|
||||
retries: 30
|
||||
delay: 5
|
||||
until: remnawave_auth_status.rc == 0
|
||||
|
||||
- name: Записать список пользователей
|
||||
ansible.builtin.copy:
|
||||
dest: "{{ remnawave_dir }}/users.json"
|
||||
content: "{{ lookup('file', 'users.yml') | from_yaml | to_json }}"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0600"
|
||||
|
||||
- name: Проверить, что панель сама в NetBird
|
||||
ansible.builtin.command: netbird status
|
||||
register: remnawave_local_netbird
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
|
||||
- name: Узнать NetBird IP ноды
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
if [ -z "${NB_API_TOKEN:-}" ]; then
|
||||
exit 0
|
||||
fi
|
||||
curl -fsS --max-time 20 -H "Authorization: Token ${NB_API_TOKEN}" \
|
||||
"{{ remnawave_netbird_peers_url }}" \
|
||||
| jq -r --arg h "$NB_HOST" '
|
||||
(if type == "array" then . elif type == "object" then (.items // .peers // []) else [] end)
|
||||
| map(select((.hostname // "") == $h or (.name // "") == $h or (.dns_label // "") == $h))
|
||||
| .[0].ip // empty'
|
||||
args:
|
||||
executable: /bin/bash
|
||||
environment:
|
||||
NB_API_TOKEN: "{{ lookup('env', 'NETBIRD_API_TOKEN', default='') }}"
|
||||
NB_HOST: "{{ remnawave_node_netbird_hostname }}"
|
||||
register: remnawave_node_nb
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
|
||||
- name: Подставить NetBird-адрес ноды
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_node_address: "{{ remnawave_node_nb.stdout | trim }}"
|
||||
when:
|
||||
- remnawave_node_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
- "'Management: Connected' in (remnawave_local_netbird.stdout | default(''))"
|
||||
|
||||
- name: Peer ноды ещё не в NetBird
|
||||
ansible.builtin.debug:
|
||||
msg: "Адрес ноды остаётся {{ remnawave_node_address }}: панель ещё не в NetBird или peer {{ remnawave_node_netbird_hostname }} не найден."
|
||||
when: >-
|
||||
(remnawave_node_nb.stdout | default('') | trim is not match('^[0-9.]+$')) or
|
||||
('Management: Connected' not in (remnawave_local_netbird.stdout | default('')))
|
||||
|
||||
- name: Инициализировать админа, API-токен, профиль DE-Yali, ноду и хост
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
{{ lookup('template', 'bootstrap-panel.sh.j2') }}
|
||||
args:
|
||||
executable: /bin/bash
|
||||
environment:
|
||||
RW_ADMIN_USER: "{{ remnawave_admin_username }}"
|
||||
RW_ADMIN_PASS: "{{ remnawave_admin_password }}"
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_NODE_SECRET: "{{ lookup('env', 'REMNANODE_SECRET_KEY', default='') }}"
|
||||
RW_TOKEN_NAME: "{{ remnawave_api_token_name }}"
|
||||
RW_PROFILE_NAME: "{{ remnawave_profile_name }}"
|
||||
RW_INBOUND_TAG: "{{ remnawave_inbound_tag }}"
|
||||
RW_NODE_NAME: "{{ remnawave_node_name }}"
|
||||
RW_NODE_ADDR: "{{ remnawave_node_address }}"
|
||||
RW_NODE_PORT: "{{ remnawave_node_port }}"
|
||||
RW_SUB_DOMAIN: "{{ remnawave_sub_domain }}"
|
||||
RW_XRAY_USER: "{{ remnawave_xray_checker_user }}"
|
||||
RW_NODE_CC: "{{ remnawave_node_country }}"
|
||||
RW_SELFSTEAL: "{{ remnawave_selfsteal_domain }}"
|
||||
RW_XHTTP_PATH: "{{ remnawave_xhttp_path }}"
|
||||
RW_HOST_REMARK: "{{ remnawave_host_remark }}"
|
||||
RW_XRAY_TEMPLATE_NAME: "{{ remnawave_xray_template_name }}"
|
||||
RW_XRAY_TEMPLATE_FILE: "{{ remnawave_dir }}/xray-except-ru.json"
|
||||
RW_PROFILE_FILE: "{{ remnawave_dir }}/profile-de-yali.json"
|
||||
RW_PANEL_DOMAIN: "{{ remnawave_panel_domain }}"
|
||||
RW_USERS_FILE: "{{ remnawave_dir }}/users.json"
|
||||
RW_SECRETS_FILE: "{{ remnawave_dir }}/.bootstrap-secrets.json"
|
||||
register: remnawave_bootstrap_raw
|
||||
changed_when: false
|
||||
failed_when: remnawave_bootstrap_raw.rc != 0
|
||||
|
||||
- name: Разобрать статус bootstrap
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_bootstrap: "{{ remnawave_bootstrap_raw.stdout | from_json }}"
|
||||
|
||||
- name: Прочитать API-токен и SECRET_KEY (файл не попадает в лог)
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ remnawave_dir }}/.bootstrap-secrets.json"
|
||||
register: remnawave_bootstrap_secrets
|
||||
no_log: true
|
||||
|
||||
- name: Подставить секреты bootstrap в факты
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_api_token: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).api_token }}"
|
||||
remnawave_node_secret: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).node_secret }}"
|
||||
remnawave_xray_checker_url: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).xray_checker_subscription_url | default('') }}"
|
||||
no_log: true
|
||||
|
||||
- name: Проверить, что SECRET_KEY ноды получен
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- (remnawave_node_secret | default('') | length > 0) or (lookup('env', 'REMNANODE_SECRET_KEY', default='') | length > 0)
|
||||
fail_msg: "Панель не вернула SECRET_KEY ноды (GET /api/keygen/). Проверьте версию Remnawave и повторите прогон."
|
||||
|
||||
- name: Проверить наличие API-токена
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- remnawave_api_token | default('') | length > 0
|
||||
fail_msg: >-
|
||||
Нет REMNAWAVE_API_TOKEN. Создайте в UI панели (Remnawave Settings → API Tokens,
|
||||
scopes=*), положите в Infisical /services/remnawave и перезапустите ansible-core-net.
|
||||
|
||||
- name: Сохранить API-токен и SECRET_KEY ноды в Infisical
|
||||
- name: Сохранить API-токен, SECRET_KEY ноды и ссылку Xray Checker в Infisical при изменении
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
args=(
|
||||
@@ -320,12 +45,12 @@
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_NODE_SECRET: "{{ remnawave_node_secret | default(lookup('env', 'REMNANODE_SECRET_KEY', default='')) }}"
|
||||
RW_XRAY_URL: "{{ remnawave_xray_checker_url | default('') }}"
|
||||
when: remnawave_api_token | default('') | length > 0
|
||||
when:
|
||||
- remnawave_api_token | default('') | length > 0
|
||||
- remnawave_need_infisical_sync | bool
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
# Токен перевыпускается каждым прогоном, поэтому регистрация в Agent Vault
|
||||
# перезаписывает креденшл тем же шагом: иначе агент останется с протухшим.
|
||||
- name: Зарегистрировать панель Remnawave в Agent Vault
|
||||
ansible.builtin.include_role:
|
||||
name: agent_vault_service
|
||||
@@ -341,54 +66,13 @@
|
||||
agent_vault_secret_key: REMNAWAVE_API_TOKEN
|
||||
when: remnawave_api_token | default('') | length > 0
|
||||
|
||||
- name: Записать .env subscription-page
|
||||
ansible.builtin.template:
|
||||
src: subscription.env.j2
|
||||
dest: "{{ remnawave_subscription_dir }}/.env"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0600"
|
||||
no_log: true
|
||||
|
||||
- name: Записать compose subscription-page
|
||||
ansible.builtin.template:
|
||||
src: subscription-compose.yaml.j2
|
||||
dest: "{{ remnawave_subscription_dir }}/compose.yaml"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
|
||||
- name: Запустить subscription-page
|
||||
ansible.builtin.command: docker compose -f {{ remnawave_subscription_dir }}/compose.yaml up -d --force-recreate --remove-orphans
|
||||
register: remnawave_sub_up
|
||||
changed_when: >-
|
||||
'Started' in remnawave_sub_up.stderr or
|
||||
'Created' in remnawave_sub_up.stderr or
|
||||
'Recreated' in remnawave_sub_up.stderr or
|
||||
'Pulled' in remnawave_sub_up.stderr
|
||||
|
||||
# Корень / за ProxyCheck рвёт коннект без proxy-заголовков; через Traefik
|
||||
# без shortUuid тоже 502. Официальный probe — /internal/health внутри контейнера
|
||||
# (docker HEALTHCHECK). С хоста проверяем State.Health.Status.
|
||||
- name: Дождаться subscription-page (docker health)
|
||||
ansible.builtin.shell: |
|
||||
docker inspect remnawave-subscription-page --format '{% raw %}{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}{% endraw %}'
|
||||
register: remnawave_sub_health
|
||||
changed_when: false
|
||||
retries: 30
|
||||
delay: 2
|
||||
until: (remnawave_sub_health.stdout | trim) == 'healthy'
|
||||
|
||||
- name: Итог Remnawave panel
|
||||
ansible.builtin.debug:
|
||||
msg:
|
||||
- "Панель: https://{{ remnawave_panel_domain }}"
|
||||
- "Подписка: https://{{ remnawave_sub_domain }}"
|
||||
- "Админ-логин в Infisical /services/remnawave: REMNAWAVE_ADMIN_USER={{ remnawave_admin_username }}"
|
||||
- "Админ-пароль сгенерирован в этом прогоне: {{ remnawave_need_admin_password }}"
|
||||
- "Админ создан в этом прогоне: {{ remnawave_bootstrap.admin_created | default(false) }}"
|
||||
- "API-токен обновлён в Infisical: {{ remnawave_bootstrap.token_updated | default(false) }}"
|
||||
- "Профиль {{ remnawave_profile_name }}: {{ remnawave_bootstrap.profile_uuid | default('n/a') }}"
|
||||
- "Нода {{ remnawave_node_name }}: {{ remnawave_bootstrap.node_uuid | default('n/a') }} адрес {{ remnawave_bootstrap.node_address | default(remnawave_node_address) }}"
|
||||
- "Ссылка Xray Checker записана в Infisical: {{ remnawave_bootstrap.xray_checker_url_saved | default(false) }}"
|
||||
- "Host {{ remnawave_selfsteal_domain }}: {{ remnawave_bootstrap.host_uuid | default('n/a') }}"
|
||||
- "SECRET_KEY ноды получен в этом прогоне: {{ remnawave_bootstrap.node_secret_created | default(false) }}"
|
||||
- "Изменения sync (nodes.yml / users.yml): {{ remnawave_sync.changes | default([]) }}"
|
||||
- "Предупреждения sync: {{ remnawave_sync.warnings | default([]) }}"
|
||||
Reference in new issue
Block a user