introduce new template var postfix.int_ip

This simply quotes IPv6 for postfix configuration.

diff --git a/PMG/Config.pm b/PMG/Config.pm
index 6832d75911c884a95b57b0b3ab6488ee839170aa..18b076aefd0e9c258db86315863a66f56bae4462 100755 (executable)
--- a/PMG/Config.pm
+++ b/PMG/Config.pm
@@ -1076,6 +1076,12 @@ sub get_template_vars {
        $self->get('mail', 'spf');
     $vars->{postfix}->{usepolicy} = $usepolicy;
 
+    if ($int_ip =~ m/^$IPV6RE$/) {
+        $vars->{postfix}->{int_ip} = "[$int_ip]";
+    } else {
+        $vars->{postfix}->{int_ip} = $int_ip;
+    }
+
     my $resolv = PVE::INotify::read_file('resolvconf');
     $vars->{dns}->{hostname} = $nodename;
 

diff --git a/templates/master.cf.in b/templates/master.cf.in
index 725fba851c08bf9e22e9b31011e9325b35918f52..9b63bbc9fa27e52f0436bb8e27976f3183984f40 100644 (file)
--- a/templates/master.cf.in
+++ b/templates/master.cf.in
@@ -91,7 +91,7 @@ smtpd       pass  - -       -       -       [% pmg.mail.max_smtpd_in %]      smt
     -o content_filter=scan:127.0.0.1:10024
     -o receive_override_options=no_address_mappings
     -o smtpd_discard_ehlo_keywords=silent-discard,dsn
-    -o mynetworks=127.0.0.0/8,[% ipconfig.int_ip %]
+    -o mynetworks=127.0.0.0/8,[% postfix.int_ip %]
 
 127.0.0.1:10025 inet  n       -       n       -       -      smtpd
        -o content_filter=