From 8c90b437f3eabd552f10d314f750aedc6359f6da Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Sat, 7 Sep 2019 12:48:11 +0000 Subject: [PATCH] add nat46 in gluon --- hosts | 2 +- roles/babeld/templates/interfaces | 4 ++++ roles/unbound/defaults/main.yml | 4 ++-- roles/unbound/templates/modules.conf | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hosts b/hosts index c599574b..a31034cc 100755 --- a/hosts +++ b/hosts @@ -1,4 +1,4 @@ -#! /usr/bin/env python2 +#!/usr/bin/env python2 from sys import path path.append("lib") diff --git a/roles/babeld/templates/interfaces b/roles/babeld/templates/interfaces index 75d23634..20656695 100644 --- a/roles/babeld/templates/interfaces +++ b/roles/babeld/templates/interfaces @@ -19,9 +19,13 @@ iface {{ babel_bridge }} inet6 static pre-down ip -6 rule del to {{ ipv6_babelmesh_network }} table {{ ffhb_routing_table }} priority 16385 post-up ip -6 rule add to {{ ipv6_babelclient_network }} table {{ ffhb_routing_table }} priority 16385 pre-down ip -6 rule del to {{ ipv6_babelclient_network }} table {{ ffhb_routing_table }} priority 16385 + post-up ip -6 rule add to fd2f:5119:f2c:624::/48 table {{ ffhb_routing_table }} priority 16385 + pre-down ip -6 rule del to fd2f:5119:f2c:624::/48 table {{ ffhb_routing_table }} priority 16385 post-up ip -6 rule add from {{ ipv6_babelmesh_network }} table {{ ffhb_routing_table }} priority 16385 pre-down ip -6 rule del from {{ ipv6_babelmesh_network }} table {{ ffhb_routing_table }} priority 16385 post-up ip -6 rule add from {{ ipv6_babelclient_network }} table {{ ffhb_routing_table }} priority 16385 pre-down ip -6 rule del from {{ ipv6_babelclient_network }} table {{ ffhb_routing_table }} priority 16385 + post-up ip -6 rule add from fd2f:5119:f2c:624::/48 table {{ ffhb_routing_table }} priority 16385 + pre-down ip -6 rule del from fd2f:5119:f2c:624::/48 table {{ ffhb_routing_table }} priority 16385 post-up ip -r r add {{ babel_ipv6_mesh.address }}/128 dev $IFACE proto 159 table {{ ffhb_routing_table }} diff --git a/roles/unbound/defaults/main.yml b/roles/unbound/defaults/main.yml index c8d47035..317b89bf 100644 --- a/roles/unbound/defaults/main.yml +++ b/roles/unbound/defaults/main.yml @@ -1,6 +1,6 @@ --- dns_root_hints: http://www.internic.net/domain/named.cache -nat64: "64:ff9b::/96" +#nat64: "64:ff9b::/96" # http://www.trex.fi/2011/dns64.html # nat64: "2001:67c:2b0:db32:0:1::/96" -unbound_nat64_pool: "{{ nat64 }}" +#unbound_nat64_pool: "{{ nat64 }}" diff --git a/roles/unbound/templates/modules.conf b/roles/unbound/templates/modules.conf index a8b9f5ab..8392b6b4 100644 --- a/roles/unbound/templates/modules.conf +++ b/roles/unbound/templates/modules.conf @@ -1,5 +1,5 @@ server: -{% if babel %} +{% if unbound_nat64_pool is defined %} module-config: "dns64 validator iterator" dns64-prefix: {{ unbound_nat64_pool }} {% else %}