From cce6aba4cdfcbb954e3228970f8cb9aed592f209 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Thu, 4 Jun 2026 01:45:16 +0200 Subject: [PATCH] fix(edge_vps): fix wireguard route template and update elastic/vps vars --- roles/edge_vps/tasks/50_elastic_agent.yaml | 7 ++++--- roles/edge_vps/templates/wireguard/wg0.conf.j2 | 4 ++-- vars/group_vars/vps/vars.yaml | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/roles/edge_vps/tasks/50_elastic_agent.yaml b/roles/edge_vps/tasks/50_elastic_agent.yaml index cd3faab..be8a77a 100644 --- a/roles/edge_vps/tasks/50_elastic_agent.yaml +++ b/roles/edge_vps/tasks/50_elastic_agent.yaml @@ -24,6 +24,7 @@ mode: "0644" - name: Start Elastic Agent - community.docker.docker_compose_v2: - project_src: "{{ edge_vps_elastic_config_dir }}" - state: present + ansible.builtin.command: + cmd: podman compose up -d + chdir: "{{ edge_vps_elastic_config_dir }}" + changed_when: false diff --git a/roles/edge_vps/templates/wireguard/wg0.conf.j2 b/roles/edge_vps/templates/wireguard/wg0.conf.j2 index 2026eff..0c24e29 100644 --- a/roles/edge_vps/templates/wireguard/wg0.conf.j2 +++ b/roles/edge_vps/templates/wireguard/wg0.conf.j2 @@ -7,12 +7,12 @@ PostUp = sysctl -w net.ipv4.ip_forward=1 PostUp = iptables -A FORWARD -i {{ edge_vps_wireguard_interface }} -j ACCEPT PostUp = iptables -A FORWARD -o {{ edge_vps_wireguard_interface }} -j ACCEPT {% for route in edge_vps_wireguard_routes | default([]) %} -PostUp = ip route add {{ route }} via {{ route.gateway }} dev {{ edge_vps_wireguard_interface }} +PostUp = ip route add {{ route.network }} via {{ route.gateway }} dev {{ edge_vps_wireguard_interface }} {% endfor %} PostDown = iptables -D FORWARD -i {{ edge_vps_wireguard_interface }} -j ACCEPT PostDown = iptables -D FORWARD -o {{ edge_vps_wireguard_interface }} -j ACCEPT {% for route in edge_vps_wireguard_routes | default([]) %} -PostDown = ip route del {{ route }} via {{ route.gateway }} dev {{ edge_vps_wireguard_interface }} +PostDown = ip route del {{ route.network }} via {{ route.gateway }} dev {{ edge_vps_wireguard_interface }} {% endfor %} {% for peer in vault_edge_vps.wireguard.peers %} diff --git a/vars/group_vars/vps/vars.yaml b/vars/group_vars/vps/vars.yaml index 06599ce..8b2596a 100644 --- a/vars/group_vars/vps/vars.yaml +++ b/vars/group_vars/vps/vars.yaml @@ -9,6 +9,8 @@ edge_vps_pangolin_base_endpoint: "pangolin.seyshiro.de" edge_vps_pangolin_base_domain: "seyshiro.de" edge_vps_acme_email: "me+acme@tudattr.dev" +edge_vps_traefik_extra_tls_domains: + - "tudattr.dev" edge_vps_elastic_version: "9.2.2" edge_vps_elastic_dns_server: "10.43.0.10"