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";
} ) 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( {
dest => "$user\@$machine:". $export->option('virtual'),
} ) or die "rsync to $machine failed: ". join(" / ", $rsync->err);
# warn $rsync->out;
-
- ssh("$user\@$machine", "postfix reload");
+ ssh("$user\@$machine", $export->option('postmap')
+ || 'postmap hash:/etc/postfix/virtual');
+ ssh("$user\@$machine", $export->option('reload') || 'postfix reload');
}