diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml index 1ccb9c5..d8572ee 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('dnat', 'defined') ) %}\ + {% for properties in ( services_host_services.values() | selectattr('tcp', 'defined') ) %}\ {{ vpn_bridge_dnat.append({ 'inet_address': properties.inet_address, 'inet6_address': properties.inet6_address, - 'ports': properties.dnat + 'ports': properties.tcp }) }}\ {% endfor %}\ {{ vpn_bridge_dnat }}" diff --git a/inventory/host_vars/yggdrasil/vars.yml b/inventory/host_vars/yggdrasil/vars.yml index b6370dc..4da1d2d 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" - dnat: [80, 443] + tcp: [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" - dnat: ["{{ services.git.ssh_port }}"] + tcp: ["{{ services.git.ssh_port }}"] restic: true notes: inet_address: "{{ vpn_bridge_inet_prefix }}.6" diff --git a/roles b/roles index 1bcd445..ffe6503 160000 --- a/roles +++ b/roles @@ -1 +1 @@ -Subproject commit 1bcd445dc67c8efc1ded26356740bbaa727c305f +Subproject commit ffe65032db646abf9ddb500dcefdea887e45ce6e