From 77f6ded748eae7045d96c98f65b1c4b77dc5c794 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 4 Sep 2024 08:34:39 +0200
Subject: [PATCH] Strip out brackets from ipv6

---
 manifests/mail/postfix.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/mail/postfix.pp b/manifests/mail/postfix.pp
index 4cd8111d7..ef27953b5 100644
--- a/manifests/mail/postfix.pp
+++ b/manifests/mail/postfix.pp
@@ -20,6 +20,9 @@
   $config = lookup($environment)
   $db_hosts = join($config['db_hosts'], ' ')
   $relay_hosts = join($relay_servers, ', ')
+  $incoming_servers = $relaying_servers.map |$server| { 
+    regsubst($server, '[\\[\\]]', '', 'G')
+  }
   $nextcloud_db = 'nextcloud'
   $nextcloud_db_user ='nextcloud'
   $nextcloud_mysql_password = lookup('nextcloud_mysql_password')
@@ -46,7 +49,7 @@
   $restricted_ports = [25]
   $restricted_ports.each|$port| {
     sunet::nftables::docker_expose { "mail_port_${port}":
-      allow_clients => $relay_hosts,
+      allow_clients => $incoming_servers,
       port          => $port,
       iif           => $interface,
     }