summaryrefslogtreecommitdiff
path: root/roles/network/openvpn
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-09-06 00:18:41 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-09-06 00:18:41 +0200
commite2a371a84d78230812db6912a290cedc5560ebed (patch)
treedc8dbca43e7e1fadb21a2b1ae2086297698a6615 /roles/network/openvpn
parentreplace some ipaddr() filter calls to new location (still a lot left todo...) (diff)
replace some more ipaddr() filter calls..
Diffstat (limited to 'roles/network/openvpn')
-rw-r--r--roles/network/openvpn/server/templates/client.j24
-rw-r--r--roles/network/openvpn/server/templates/conf.j24
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/network/openvpn/server/templates/client.j2 b/roles/network/openvpn/server/templates/client.j2
index 0a0faf5f..1c77e457 100644
--- a/roles/network/openvpn/server/templates/client.j2
+++ b/roles/network/openvpn/server/templates/client.j2
@@ -1,4 +1,4 @@
-ifconfig-push {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[client]) | ipaddr('address') }} {{ openvpn_zone.subnet | ipaddr('netmask') }}
+ifconfig-push {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[client]) | ansible.utils.ipaddr('address') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr('netmask') }}
{% for route in (openvpn_zone.routes[client] | default([])) %}
-iroute {{ route | ipaddr('network') }} {{ route | ipaddr('netmask') }}
+iroute {{ route | ansible.utils.ipaddr('network') }} {{ route | ansible.utils.ipaddr('netmask') }}
{% endfor %}
diff --git a/roles/network/openvpn/server/templates/conf.j2 b/roles/network/openvpn/server/templates/conf.j2
index 7bfff141..cad82981 100644
--- a/roles/network/openvpn/server/templates/conf.j2
+++ b/roles/network/openvpn/server/templates/conf.j2
@@ -19,7 +19,7 @@ dev tun
persist-tun
topology subnet
-ifconfig {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[inventory_hostname]) | ipaddr('address') }} {{ openvpn_zone.subnet | ipaddr('netmask') }}
+ifconfig {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr('netmask') }}
push "topology subnet"
client-config-dir {{ openvpn_zone.name }}-ccd/
ccd-exclusive
@@ -27,6 +27,6 @@ ccd-exclusive
## static routes for client {{ client }}
{% for route in routes %}
-route {{ route | ipaddr('network') }} {{ route | ipaddr('netmask') }} {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[client]) | ipaddr('address') }}
+route {{ route | ansible.utils.ipaddr('network') }} {{ route | ansible.utils.ipaddr('netmask') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[client]) | ansible.utils.ipaddr('address') }}
{% endfor %}
{% endfor %}