Ticket #39615 Fix versions for upgrades

[freeside.git] / bin / postfix.export

diff --git a/bin/postfix.export b/bin/postfix.export
index 64d9738..61380da 100755 (executable)
--- a/bin/postfix.export
+++ b/bin/postfix.export
@@ -40,7 +40,7 @@ foreach my $export ( @exports ) {
     my $srcsvc_acct = $svc_forward->srcsvc_acct;
     if ( $srcsvc_acct ) {
       ( $username, $domain ) = ( $srcsvc_acct->username, $srcsvc_acct->domain );
-    } elsif ( $svc_forward->src =~ /([^@]*)\@([^@]+)$/ ) {
+    } elsif ( $svc_forward->src =~ /^([^@]*)\@([^@]+)$/ ) {
       ( $username, $domain ) = ( $1, $2 );
     } else {
       die "bad svc_forward record?  svcnum ". $svc_forward->svcnum. "\n";
@@ -99,7 +99,7 @@ foreach my $export ( @exports ) {
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
 
-  ssh("$user\@$machine", "newaliases");
+  ssh("$user\@$machine", $export->option('newaliases') || 'newaliases');
 #  ssh("$user\@$machine", "postfix reload");
 
   $rsync->exec( {
@@ -107,8 +107,9 @@ foreach my $export ( @exports ) {
     dest    => "$user\@$machine:". $export->option('virtual'),
   } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
 #  warn $rsync->out;
-  ssh("$user\@$machine", "postmap hash:/etc/postfix/virtual");
-  ssh("$user\@$machine", "postfix reload");
+  ssh("$user\@$machine", $export->option('postmap')
+                         || 'postmap hash:/etc/postfix/virtual');
+  ssh("$user\@$machine", $export->option('reload') || 'postfix reload');
 
 }