From cd677eaadf2d6c3704eed8d1a1ba2fc7e18d6c11 Mon Sep 17 00:00:00 2001 From: karpenok Date: Mon, 9 Nov 2026 20:31:32 +0700 Subject: [PATCH] revert: drop accidentally committed WIP files (keep only CI fix) --- ansible/inventories/prod/group_vars/netbird.yml | 2 +- ansible/inventories/prod/hosts.yml | 8 +------- ansible/roles/host/tasks/main.yml | 6 +----- terraform/pve/main.tf | 1 - terraform/pve/outputs.tf | 1 - terraform/pve/terraform.tfvars.example | 1 - terraform/pve/variables.tf | 1 - 7 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ansible/inventories/prod/group_vars/netbird.yml b/ansible/inventories/prod/group_vars/netbird.yml index 3473a14..c123746 100644 --- a/ansible/inventories/prod/group_vars/netbird.yml +++ b/ansible/inventories/prod/group_vars/netbird.yml @@ -1 +1 @@ -netbird_domain: central.gunihome.ru +netbird_domain: central.myguni.ru diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml index d0fa3ba..9ae2ba9 100644 --- a/ansible/inventories/prod/hosts.yml +++ b/ansible/inventories/prod/hosts.yml @@ -1,13 +1,7 @@ all: children: home: - hosts: - core-net: - ansible_host: 192.168.1.104 - ansible_user: root - core_net: - hosts: - core-net: + hosts: {} vps: # ВАЖНО # Поле ansible_password у внешних VPS — это одноразовый стартовый пароль от хостера diff --git a/ansible/roles/host/tasks/main.yml b/ansible/roles/host/tasks/main.yml index 7188153..7811dee 100644 --- a/ansible/roles/host/tasks/main.yml +++ b/ansible/roles/host/tasks/main.yml @@ -75,17 +75,13 @@ ansible.builtin.command: ufw allow OpenSSH register: ufw_ssh changed_when: "'added' in (ufw_ssh.stdout | lower)" - when: ansible_virtualization_type | default('') != 'lxc' - name: Проверить состояние firewall ansible.builtin.command: ufw status register: ufw_status changed_when: false - when: ansible_virtualization_type | default('') != 'lxc' - name: Включить firewall ansible.builtin.command: ufw --force enable - when: - - ansible_virtualization_type | default('') != 'lxc' - - "'Status: active' not in ufw_status.stdout" + when: "'Status: active' not in ufw_status.stdout" changed_when: true diff --git a/terraform/pve/main.tf b/terraform/pve/main.tf index eeb59fb..98a41db 100644 --- a/terraform/pve/main.tf +++ b/terraform/pve/main.tf @@ -20,4 +20,3 @@ provider "proxmox" { agent = true } } - diff --git a/terraform/pve/outputs.tf b/terraform/pve/outputs.tf index 10668a9..570ef7d 100644 --- a/terraform/pve/outputs.tf +++ b/terraform/pve/outputs.tf @@ -1,2 +1 @@ # Выходные параметры для узла pve - diff --git a/terraform/pve/terraform.tfvars.example b/terraform/pve/terraform.tfvars.example index a984623..2172cad 100644 --- a/terraform/pve/terraform.tfvars.example +++ b/terraform/pve/terraform.tfvars.example @@ -2,4 +2,3 @@ proxmox_endpoint = "https://192.168.1.2:8006/" proxmox_api_token = "root@pam!automation-stack=00000000-0000-0000-0000-000000000000" proxmox_insecure = true proxmox_node = "pve" - diff --git a/terraform/pve/variables.tf b/terraform/pve/variables.tf index 483de70..d1cb498 100644 --- a/terraform/pve/variables.tf +++ b/terraform/pve/variables.tf @@ -30,4 +30,3 @@ variable "ssh_public_keys" { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwqB40k8QQq3k8160gfMKDaCJCX9qzvmuijfe3mO4I gitea-runner" ] } -