diff options
Diffstat (limited to 'roles/tinc/templates')
-rwxr-xr-x | roles/tinc/templates/tinc-up.j2 | 6 | ||||
-rw-r--r-- | roles/tinc/templates/tinc.conf.j2 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/roles/tinc/templates/tinc-up.j2 b/roles/tinc/templates/tinc-up.j2 index 92aa782..ea81512 100755 --- a/roles/tinc/templates/tinc-up.j2 +++ b/roles/tinc/templates/tinc-up.j2 @@ -1,11 +1,11 @@ #!/bin/sh ip link set $INTERFACE up ip -6 addr flush dev $INTERFACE -{% for addr in tinc.address %} +{% for addr in tinc_options.address %} ip addr add {{ addr }} dev $INTERFACE {% endfor %} -{% if tinc.extra_up is defined %} -{% for cmd in tinc.extra_up %} +{% if tinc_options.extra_up is defined %} +{% for cmd in tinc_options.extra_up %} {{ cmd }} {% endfor %} {% endif %} diff --git a/roles/tinc/templates/tinc.conf.j2 b/roles/tinc/templates/tinc.conf.j2 index b7011e1..aa639ab 100644 --- a/roles/tinc/templates/tinc.conf.j2 +++ b/roles/tinc/templates/tinc.conf.j2 @@ -1,11 +1,11 @@ -Name = {{ tinc.name }} -{% if tinc.listen_on is defined %} -AddressFamily = {{ tinc.listen_on }} +Name = {{ tinc_options.name }} +{% if tinc_options.listen_on is defined %} +AddressFamily = {{ tinc_options.listen_on }} {% else %} AddressFamily = ipv6 {% endif %} Interface = tn_int Mode = switch -{% for conn in tinc.connections %} +{% for conn in tinc_options.connections %} ConnectTo = {{ conn }} {% endfor %} |