diff options
| author | ivan <ivan> | 2002-02-20 01:03:10 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2002-02-20 01:03:10 +0000 |
| commit | 8f42b751aebda2e7dce2c363bed6f1e15b411b1d (patch) | |
| tree | 942c30415b1e1683dec03dd62dcc24d575f7de46 /FS/FS/svc_forward.pm | |
| parent | 47bc56487b4aebf3e415767a053dc049fe4a28d4 (diff) | |
use Net::SSH::ssh_cmd for all job queueing rather than local duplicated ssh subs
queue daemon updates: retry & remove links work, bubble up error message
to webinterface, link to svcnum & have job listings on view/svc_* pages,
closes: Bug#280
s/option/optionname/ schema change, dumb mysql, closes: Bug#334
Diffstat (limited to 'FS/FS/svc_forward.pm')
| -rw-r--r-- | FS/FS/svc_forward.pm | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm index 7e0a4fd..12f8b92 100644 --- a/FS/FS/svc_forward.pm +++ b/FS/FS/svc_forward.pm @@ -140,7 +140,11 @@ sub insert { foreach my $vpopmailmachine ( @vpopmailmachines ) { my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine); - my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' }; # should be neater + my $queue = new FS::queue { + 'svcnum' => $self->svcnum, + 'job' => 'Net::SSH::ssh_cmd', + }; + # should be neater my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") unless $nossh_hack; if ( $error ) { @@ -209,7 +213,8 @@ sub delete { foreach my $vpopmailmachine ( @vpopmailmachines ) { my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine); - my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' }; # should be neater + my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' }; + # should be neater my $error = $queue->insert("root\@$machine", "sed -e '/^$destination/d' " . "< $vpopdir/domains/$domain/$username/.qmail" . @@ -302,7 +307,11 @@ sub replace { foreach my $vpopmailmachine ( @vpopmailmachines ) { my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine); - my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' }; # should be neater + my $queue = new FS::queue { + 'svcnum' => $new->svcnum, + 'job' => 'Net::SSH::ssh_cmd', + }; + # should be neater my $error = $queue->insert("root\@$machine", "sed -e '/^$destination/d' " . "< $vpopdir/domains/$old_domain/$old_username/.qmail" . @@ -332,7 +341,11 @@ sub replace { foreach my $vpopmailmachine ( @vpopmailmachines ) { my($machine, $vpopdir, $vpopuid, $vpopgid) = split(/\s+/, $vpopmailmachine); - my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' }; # should be neater + my $queue = new FS::queue { + 'svcnum' => $new->svcnum, + 'job' => 'Net::SSH::ssh_cmd', + }; + # should be neater my $error = $queue->insert("root\@$machine","[ -d $vpopdir/domains/$domain/$username ] && { echo \"$destination\" >> $vpopdir/domains/$domain/$username/.qmail; chown $vpopuid:$vpopgid $vpopdir/domains/$domain/$username/.qmail; }") unless $nossh_hack; if ( $error ) { @@ -439,7 +452,7 @@ sub dstsvc_acct { =head1 VERSION -$Id: svc_forward.pm,v 1.10 2002-02-17 19:07:32 jeff Exp $ +$Id: svc_forward.pm,v 1.11 2002-02-20 01:03:09 ivan Exp $ =head1 BUGS |