From 2664d3cbad4746edf83e4fde05c2f760134b1f50 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 31 Jan 2018 14:18:47 +0100 Subject: [PATCH] introduce new template var postfix.int_ip This simply quotes IPv6 for postfix configuration. --- PMG/Config.pm | 6 ++++++ templates/master.cf.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PMG/Config.pm b/PMG/Config.pm index 6832d75..18b076a 100755 --- 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 725fba8..9b63bbc 100644 --- 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= -- 2.39.2