Update example/test variables

6 files changed, 20 insertions, 12 deletions

diff --git a/host_vars/archlinux.local.yml.example b/host_vars/archlinux.local.yml.example
index c31bef97..85a11502 100644
--- a/host_vars/archlinux.local.yml.example
+++ b/host_vars/archlinux.local.yml.example
@@ -1,11 +1,11 @@
 ---
 # Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole)
 network_ipv4_address: "10.0.0.201"
-network_ipv4_gateway: "10.0.0.200"
-network_ipv4_dns: "10.0.0.200"
+network_ipv4_gateway: "10.0.0.254"
+network_ipv4_dns: "10.0.0.254"
 network_ipv6_address: "fd5c:fd8b:2b8c::201/64"
-network_ipv6_gateway: "fd5c:fd8b:2b8c::200"
-network_ipv6_dns: "fd5c:fd8b:2b8c::200"
+network_ipv6_gateway: "fd5c:fd8b:2b8c::254"
+network_ipv6_dns: "fd5c:fd8b:2b8c::254"
 
 wireguard_connections:
   wg-vpn1: |
diff --git a/host_vars/rpi5.local.yml.example b/host_vars/rpi5.local.yml.example
index 7af78b98..7bfa08e7 100644
--- a/host_vars/rpi5.local.yml.example
+++ b/host_vars/rpi5.local.yml.example
@@ -1,13 +1,14 @@
 ---
-network_ipv4_address: "10.0.0.200"
+network_interface: "eth0"
+network_ipv4_address: "10.0.0.254"
 network_ipv4_gateway: "10.0.0.1"
-
-network_ipv6_address: "fd5c:fd8b:2b8c::200/64"
+network_ipv6_address: "fd5c:fd8b:2b8c::254/64"
 network_ipv6_gateway: "fd5c:fd8b:2b8c::1"
 
 # TOTP generator: `openssl rand -base64 32 | head -c "20" | base32`
 pihole_totp_secret: "CHANGEME"
 pihole_password: "{{ ('changeme' | hash('sha256') | hash('sha256'))[:64] }}"
+pihole_interface: "{{ network_interface }}"
 pihole_dhcp_enabled: true
 pihole_dhcp_start: "10.0.0.100"
 pihole_dhcp_end: "10.0.0.199"
@@ -16,7 +17,6 @@ pihole_dhcp_hosts:
   - "ff:ff:ff:ff:ff:fe, 10.0.0.252,TV"
   - "ff:ff:ff:ff:ff:ff, 10.0.0.253,Printer"
 
-gateway_enabled: true
 wireguard_autostart_connection: "wg-vpn2"
 wireguard_connections:
   wg-vpn2: |
@@ -29,3 +29,7 @@ wireguard_connections:
     PublicKey = server_public_key
     AllowedIPs = 0.0.0.0/0
     Endpoint = vpn.com:51820
+
+gateway_enabled: true
+gateway_router_interface: "{{ network_interface }}"
+gateway_local_ipv4_subnet: "10.0.0.0/24"
diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml
index a59139fd..36c72d64 100644
--- a/molecule/archlinux/converge.yml
+++ b/molecule/archlinux/converge.yml
@@ -12,7 +12,8 @@
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
     wireguard_autostart_connection: ""
-    wireguard_gateway_enabled: true
+    gateway_enabled: true
+    gateway_local_ipv4_subnet: "10.0.0.0/24"
     python_global_version: "3.13"
     python_versions:
       - "3.13"
diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml
index f9b7f377..f91578f5 100644
--- a/molecule/debian/converge.yml
+++ b/molecule/debian/converge.yml
@@ -12,7 +12,8 @@
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
     wireguard_autostart_connection: ""
-    wireguard_gateway_enabled: false
+    gateway_enabled: false
+    gateway_local_ipv4_subnet: "10.0.0.0/24"
     python_global_version: "3.13"
     python_versions:
       - "3.13"
diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml
index 2b788b8e..f879b529 100644
--- a/molecule/raspberrypi/converge.yml
+++ b/molecule/raspberrypi/converge.yml
@@ -14,7 +14,8 @@
     pihole_password: "{{ ('changeme' | hash('sha256') | hash('sha256'))[:64] }}"
     pihole_dhcp_enabled: false
     wireguard_autostart_connection: ""
-    wireguard_gateway_enabled: true
+    gateway_enabled: true
+    gateway_local_ipv4_subnet: "10.0.0.0/24"
   roles:
     - role: "hostname"
     - role: "network"
diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml
index 0dc6eeb8..be57baa8 100644
--- a/molecule/ubuntu/converge.yml
+++ b/molecule/ubuntu/converge.yml
@@ -12,7 +12,8 @@
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
     wireguard_autostart_connection: ""
-    wireguard_gateway_enabled: false
+    gateway_enabled: false
+    gateway_local_ipv4_subnet: "10.0.0.0/24"
     python_global_version: "3.13"
     python_versions:
       - "3.13"