From a54ed125acffe5f03c3e49eb543c92c4e89bdce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vi=C3=B1ar=20Ulriksen?= Date: Sat, 16 May 2020 08:45:55 -0300 Subject: [PATCH] 2d fix for #159 --- tasks/system/forwarding.yml | 4 ++-- templates/server.conf.j2 | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tasks/system/forwarding.yml b/tasks/system/forwarding.yml index e059727..c624353 100644 --- a/tasks/system/forwarding.yml +++ b/tasks/system/forwarding.yml @@ -7,7 +7,7 @@ sysctl_set: true state: present reload: true - when: not ( lookup('env', 'IN_MOLECULE') ) | d(true, true) ) | bool + when: not lookup('env', 'IN_MOLECULE') | d(false, true) | bool - name: Set IPv6 forwarding in the sysctl file and reload if necessary sysctl: @@ -17,5 +17,5 @@ state: present reload: true when: - not ( lookup('env', 'IN_MOLECULE') | d(true, true) ) | bool + not lookup('env', 'IN_MOLECULE') | d(false, true) | bool and openvpn_ipv6_server is defined diff --git a/templates/server.conf.j2 b/templates/server.conf.j2 index 99a282d..ca52b05 100644 --- a/templates/server.conf.j2 +++ b/templates/server.conf.j2 @@ -14,9 +14,6 @@ port {{ openvpn_port }} # TCP or UDP server? proto {{ openvpn_proto }} -{% if openvpn_ipv6_enabled %} -proto {{ openvpn_proto }}6 -{% endif %} {% if openvpn_ipv6_enabled | bool %} proto {{ openvpn_proto }}6