From ef8179e96e8ed682cb86edff7fc24712fe6c419a Mon Sep 17 00:00:00 2001 From: karpenok Date: Thu, 19 Nov 2026 10:59:29 +0700 Subject: [PATCH] chore: remove temporary NetBird and Authentik cleanup tasks from playbooks --- ansible/playbooks/core-net.yml | 42 --------------------------------- ansible/playbooks/opnsense.yml | 43 ---------------------------------- 2 files changed, 85 deletions(-) diff --git a/ansible/playbooks/core-net.yml b/ansible/playbooks/core-net.yml index b8a4021..cc9d1b2 100644 --- a/ansible/playbooks/core-net.yml +++ b/ansible/playbooks/core-net.yml @@ -10,48 +10,6 @@ - role: vector tags: [vector] tasks: - - name: Удалить остатки NetBird и Authentik на core-net - tags: [always] - block: - - name: Проверить наличие клиента NetBird - ansible.builtin.stat: - path: /usr/bin/netbird - register: core_net_nb_bin - - - name: Отключить и остановить NetBird - ansible.builtin.command: netbird down - when: core_net_nb_bin.stat.exists - changed_when: true - failed_when: false - - - name: Удалить пакет netbird - ansible.builtin.apt: - name: netbird - state: absent - purge: true - when: core_net_nb_bin.stat.exists - - - name: Остановить и удалить контейнеры Authentik (если остались) - ansible.builtin.stat: - path: /opt/authentik/compose.yaml - register: core_net_authentik_compose - - - name: Остановить стек Authentik - ansible.builtin.command: docker compose -f /opt/authentik/compose.yaml down -v --remove-orphans - when: core_net_authentik_compose.stat.exists - changed_when: true - failed_when: false - - - name: Удалить файлы и каталоги NetBird и Authentik - ansible.builtin.file: - path: "{{ item }}" - state: absent - loop: - - /etc/apt/sources.list.d/netbird.list - - /usr/share/keyrings/netbird-archive-keyring.gpg - - /etc/netbird - - /var/lib/netbird - - /opt/authentik - name: Развернуть панель Remnawave ansible.builtin.import_role: name: core-net/remnawave diff --git a/ansible/playbooks/opnsense.yml b/ansible/playbooks/opnsense.yml index 7eaabc8..1f83f8b 100644 --- a/ansible/playbooks/opnsense.yml +++ b/ansible/playbooks/opnsense.yml @@ -2,49 +2,6 @@ - name: Маршрутизатор OPNsense hosts: opnsense gather_facts: false - pre_tasks: - - name: Проверить наличие плагина os-netbird на OPNsense - ansible.builtin.uri: - url: "https://{{ opnsense_host }}/api/netbird/service/status" - method: GET - url_username: "{{ lookup('env', 'OPNSENSE_API_KEY') }}" - url_password: "{{ lookup('env', 'OPNSENSE_API_SECRET') }}" - force_basic_auth: true - validate_certs: false - status_code: [200, 404] - register: opnsense_nb_check - tags: [always] - - - name: Остановить службу NetBird на OPNsense перед удалением плагина - ansible.builtin.uri: - url: "https://{{ opnsense_host }}/api/netbird/service/stop" - method: POST - url_username: "{{ lookup('env', 'OPNSENSE_API_KEY') }}" - url_password: "{{ lookup('env', 'OPNSENSE_API_SECRET') }}" - force_basic_auth: true - validate_certs: false - body_format: json - body: {} - status_code: [200] - when: opnsense_nb_check.status == 200 and (opnsense_nb_check.json.status | default('')) == 'running' - changed_when: true - failed_when: false - tags: [always] - - - name: Удалить плагин os-netbird из OPNsense - ansible.builtin.uri: - url: "https://{{ opnsense_host }}/api/core/firmware/remove/os-netbird" - method: POST - url_username: "{{ lookup('env', 'OPNSENSE_API_KEY') }}" - url_password: "{{ lookup('env', 'OPNSENSE_API_SECRET') }}" - force_basic_auth: true - validate_certs: false - body_format: json - body: {} - status_code: [200] - when: opnsense_nb_check.status == 200 - changed_when: true - tags: [always] roles: - role: opnsense/xray tags: [xray]