Fixed: postmap file before restart (Postfix server implementatio)

CS fixes
i-MSCP · May 20, 2015 · 46e9a7f · 46e9a7f
1 parent 8d29cfc
commit 46e9a7f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/contrib/Listeners/Named/10_bind9_localnets.pl b/contrib/Listeners/Named/10_bind9_localnets.pl
@@ -25,13 +25,10 @@ package Listener::Bind9::Localnets;
 
 sub onBeforeNamedBuildConf
 {
-	my $tplContent = shift;
-	my $tplName = shift;
+	my ($tplContent, $tplName) = @_;
 
 	if($tplName eq 'named.conf.options') {
-		$$tplContent =~ s/^(\s*allow-recursion).*$/$1 { localnets; };/m;
-		$$tplContent =~ s/^(\s*allow-query-cache).*$/$1 { localnets; };/m;
-		$$tplContent =~ s/^(\s*allow-transfer).*$/$1 { localnets; };/m;
+		$$tplContent =~ s/^(\s*allow-(?:recursion|query-cache|transfer)).*$/$1 { localnets; };/gm;
 	}
 
 	0;

diff --git a/engine/PerlLib/Servers/mta/postfix.pm b/engine/PerlLib/Servers/mta/postfix.pm
@@ -149,8 +149,19 @@ sub postinstall
 	iMSCP::Service->getInstance()->enable($self->{'config'}->{'MTA_SNAME'});
 
 	$self->{'eventManager'}->register(
-		'beforeSetupRestartServices', sub { push @{$_[0]}, [ sub { $self->restart(); }, 'Postfix' ]; 0; }
-	);
+		'beforeSetupRestartServices', sub { push @{$_[0]}, [
+			sub {
+				my $rs = 0;
+
+				for(keys %{$self->{'postmap'}}) {
+					$rs ||= $self->postmap($_);
+				}
+
+				$rs ||= $self->restart();
+			},
+			'Postfix'
+		]; 0;
+	});
 
 	$self->{'eventManager'}->trigger('afterMtaPostinstall', 'postfix');
 }
@@ -1433,8 +1444,10 @@ END
 	my $self = __PACKAGE__->getInstance();
 	my $rs = $?;
 
-	for(keys %{$self->{'postmap'}}) {
-		$rs ||= $self->postmap($_);
+	unless($main::execmode && $main::execmode eq 'setup') {
+		for(keys %{$self->{'postmap'}}) {
+			$rs ||= $self->postmap($_);
+		}
 	}
 
 	$? = $rs;