From 0dc638ea18c0558e7d3bbdc6cc9a1485e0cdfa90 Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Thu, 25 Dec 2025 18:47:08 +0400 Subject: [PATCH 1/3] Fix botched variable names --- roles/wg_hub/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/wg_hub/tasks/main.yml b/roles/wg_hub/tasks/main.yml index 78551ea..669569f 100644 --- a/roles/wg_hub/tasks/main.yml +++ b/roles/wg_hub/tasks/main.yml @@ -29,7 +29,7 @@ PreUp = sysctl -w net.ipv4.ip_forward=1 {% if dns_server is defined %} - PostUp = resolvectl dns %i {{ dns_server }}; resolvectl domain %i {{ wg_hub_iface_name }}.local + PostUp = resolvectl dns %i {{ wg_hub_dns_server }}; resolvectl domain %i {{ wg_hub_iface_name }}.local {% endif %} PostDown = sysctl -w net.ipv4.ip_forward=0 @@ -44,11 +44,11 @@ owner: root group: root mode: "0600" - marker: "# {mark} ANSIBLE MANAGED SPOKE BLOCK: {{ domain_name }}" + marker: "# {mark} ANSIBLE MANAGED SPOKE BLOCK: {{ wg_hub_domain_name }}" block: | # - [Peer] # {{ domain_name }} - PublicKey = {{ item.wg_hub_wg_pubkey }} + [Peer] # {{ wg_hub_domain_name }} + PublicKey = {{ item.wg_pubkey }} PresharedKey = {{ item.wg_psk }} - AllowedIPs = {{ item.wg_hub_ipv4_vpn_addr }}/32 + AllowedIPs = {{ item.ipv4_vpn_addr }}/32 # From 2b0ea3574d1871e8fae4f9f7753f730cf9c7cf99 Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Thu, 25 Dec 2025 18:56:50 +0400 Subject: [PATCH 2/3] Further fix variable names --- roles/wg_hub/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wg_hub/tasks/main.yml b/roles/wg_hub/tasks/main.yml index 669569f..9a55fe4 100644 --- a/roles/wg_hub/tasks/main.yml +++ b/roles/wg_hub/tasks/main.yml @@ -44,10 +44,10 @@ owner: root group: root mode: "0600" - marker: "# {mark} ANSIBLE MANAGED SPOKE BLOCK: {{ wg_hub_domain_name }}" + marker: "# {mark} ANSIBLE MANAGED SPOKE BLOCK: {{ domain_name }}" block: | # - [Peer] # {{ wg_hub_domain_name }} + [Peer] # {{ domain_name }} PublicKey = {{ item.wg_pubkey }} PresharedKey = {{ item.wg_psk }} AllowedIPs = {{ item.ipv4_vpn_addr }}/32 From 28d459f25e854f99d1ebab3772d298008fcf6c80 Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Thu, 25 Dec 2025 19:07:15 +0400 Subject: [PATCH 3/3] Fix more incorrect renames --- roles/wg_hub/molecule/default/converge.yml | 12 ++++++------ roles/wg_hub/tasks/main.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/wg_hub/molecule/default/converge.yml b/roles/wg_hub/molecule/default/converge.yml index e807dae..f9ba525 100644 --- a/roles/wg_hub/molecule/default/converge.yml +++ b/roles/wg_hub/molecule/default/converge.yml @@ -11,13 +11,13 @@ wg_hub_hide_secrets: false # dns_server: 127.0.0.1:5300 # doesn't work in Github Actions environment peers: - - wg_hub_host_id: alpha - wg_hub_ipv4_vpn_addr: 10.0.0.1 - wg_hub_wg_pubkey: LfEJgNiJ05nx4nWB0Pj3wS3WRyFq567fsdDh4XZqRF0= + - host_id: alpha + ipv4_vpn_addr: 10.0.0.1 + wg_pubkey: LfEJgNiJ05nx4nWB0Pj3wS3WRyFq567fsdDh4XZqRF0= wg_psk: i3JCrQOfptZhgpL+BTm/65MPW/ljJexCgiuWMIqZJYo= - - wg_hub_host_id: beta - wg_hub_ipv4_vpn_addr: 10.0.0.2 - wg_hub_wg_pubkey: oq3Fcwwfxsi5f5UHcZKtxMwQ2aSeHOUe3r35soUUYzU= + - host_id: beta + ipv4_vpn_addr: 10.0.0.2 + wg_pubkey: oq3Fcwwfxsi5f5UHcZKtxMwQ2aSeHOUe3r35soUUYzU= wg_psk: Z/z7Qo8hW97UcImYE/ZbCxpNmizfVhvl0dzygtvtYYg= roles: diff --git a/roles/wg_hub/tasks/main.yml b/roles/wg_hub/tasks/main.yml index 9a55fe4..1734a21 100644 --- a/roles/wg_hub/tasks/main.yml +++ b/roles/wg_hub/tasks/main.yml @@ -38,7 +38,7 @@ notify: "Run the Wireguard service" loop: "{{ peers }}" vars: - domain_name: "{{ item.wg_hub_host_id }}.{{ wg_hub_iface_name }}.local" + domain_name: "{{ item.host_id }}.{{ wg_hub_iface_name }}.local" ansible.builtin.blockinfile: path: "/etc/wireguard/{{ wg_hub_iface_name }}.conf" owner: root