From 3d9b4ad68702d9adb5a84a4ed888e8ca443caff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Nov 2015 21:32:52 +0000 Subject: [PATCH] include search domain --- functions | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/functions b/functions index 57c9cfa..fa2b558 100644 --- a/functions +++ b/functions @@ -6,9 +6,9 @@ # Defines a service residing in a given container @def &def_service($service, $container, $proto, $port) = { # look up IP addresses of the container - @def $ip4 = @resolve("$container", A); - @def $ip6 = @resolve("ipv6.$container", AAAA); - @def $ula = @resolve("ula.$container", AAAA); + @def $ip4 = @resolve("$container.$search_domain", A); + @def $ip6 = @resolve("ipv6.$container.$search_domain", AAAA); + @def $ula = @resolve("ula.$container.$search_domain", AAAA); # chain to allow forwarding to the service domain (ip ip6) table filter chain @cat("allow_", $service) daddr @ipfilter(($ip4 $ip6 $ula)) protocol $proto dport $port ACCEPT; @@ -34,9 +34,9 @@ # Allows connection from the given container to the specified service (which resides in another container) @def &allow_service_for($service, $container) = { - @def $ip4 = @resolve($container, A); - @def $ip6 = @resolve("ipv6.$container", AAAA); - @def $ula = @resolve("ula.$container", AAAA); + @def $ip4 = @resolve("$container.$search_domain", A); + @def $ip6 = @resolve("ipv6.$container.$search_domain", AAAA); + @def $ula = @resolve("ula.$container.$search_domain", AAAA); domain (ip ip6) table filter chain FORWARD saddr @ipfilter(($ip4 $ip6 $ula)) jump @cat("allow_", $service); } @@ -50,9 +50,9 @@ @def &forward_to($container, $proto, $port) = { # look up IP addresses of the container - @def $ip4 = @resolve($container, A); - @def $ip6 = @resolve("ipv6.$container", AAAA); - @def $ula = @resolve("ula.$container", AAAA); + @def $ip4 = @resolve($container.$search_domain, A); + @def $ip6 = @resolve("ipv6.$container.$search_domain", AAAA); + @def $ula = @resolve("ula.$container.$search_domain", AAAA); domain (ip ip6) { # allow forwarding to container