From aa3a38a5f4df6a566aea3d278646df3665cd992d Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sun, 22 Oct 2023 09:35:31 +0200 Subject: [PATCH] DNAT UDP as well --- inventory/group_vars/asgard/vars.yml | 4 ++-- inventory/host_vars/yggdrasil/vars.yml | 4 ++-- roles | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml index d8572ee..1ccb9c5 100644 --- a/inventory/group_vars/asgard/vars.yml +++ b/inventory/group_vars/asgard/vars.yml @@ -44,11 +44,11 @@ vpn_bridge_inet6_subnet: "{{ vpn_bridge_inet6_prefix }}::/{{ vpn_bridge_inet6_pr vpn_bridge_dnat: "\ {% set vpn_bridge_dnat = [] %}\ - {% for properties in ( services_host_services.values() | selectattr('tcp', 'defined') ) %}\ + {% for properties in ( services_host_services.values() | selectattr('dnat', 'defined') ) %}\ {{ vpn_bridge_dnat.append({ 'inet_address': properties.inet_address, 'inet6_address': properties.inet6_address, - 'ports': properties.tcp + 'ports': properties.dnat }) }}\ {% endfor %}\ {{ vpn_bridge_dnat }}" diff --git a/inventory/host_vars/yggdrasil/vars.yml b/inventory/host_vars/yggdrasil/vars.yml index 4da1d2d..b6370dc 100644 --- a/inventory/host_vars/yggdrasil/vars.yml +++ b/inventory/host_vars/yggdrasil/vars.yml @@ -147,7 +147,7 @@ services_host_services: lrproxy: inet_address: "{{ vpn_bridge_inet_prefix }}.2" inet6_address: "{{ vpn_bridge_inet6_prefix }}::2" - tcp: [80, 443] + dnat: [80, 443] restic: true database: inet_address: "{{ vpn_bridge_inet_prefix }}.3" @@ -162,7 +162,7 @@ services_host_services: git: inet_address: "{{ vpn_bridge_inet_prefix }}.5" inet6_address: "{{ vpn_bridge_inet6_prefix }}::5" - tcp: ["{{ services.git.ssh_port }}"] + dnat: ["{{ services.git.ssh_port }}"] restic: true notes: inet_address: "{{ vpn_bridge_inet_prefix }}.6" diff --git a/roles b/roles index 23a0c54..1bcd445 160000 --- a/roles +++ b/roles @@ -1 +1 @@ -Subproject commit 23a0c5463a01fe08c9bb784839a7e3b359806220 +Subproject commit 1bcd445dc67c8efc1ded26356740bbaa727c305f