use Net::SSH::ssh_cmd for all job queueing rather than local duplicated ssh subs

[freeside.git] / FS / FS / svc_domain.pm

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index bc62ea7..84a1029 100644 (file)
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -10,7 +10,7 @@ use Mail::Internet;
 use Mail::Header;
 use Date::Format;
 use Net::Whois 1.0;
-use Net::SSH qw(ssh);
+use Net::SSH;
 use FS::Record qw(fields qsearch qsearchs dbh);
 use FS::Conf;
 use FS::svc_Common;
@@ -19,6 +19,7 @@ use FS::svc_acct;
 use FS::cust_pkg;
 use FS::cust_main;
 use FS::domain_record;
+use FS::queue;
 
 @ISA = qw( FS::svc_Common );
 
@@ -228,6 +229,7 @@ sub insert {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   if ( $qshellmachine && $self->catchall && ! $nossh_hack ) {
+
     my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $self->catchall } )
       or warn "WARNING: inserted unknown catchall: ". $self->catchall;
     if ( $svc_acct && $svc_acct->dir ) {
@@ -238,7 +240,13 @@ sub insert {
         $svc_acct->gid,
         $svc_acct->dir,
       );
-      ssh("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }");
+  
+    my $queue = new FS::queue {
+      'svcnum' => $self->svcnum,
+      'job'    => 'Net::SSH::ssh_cmd',
+    };
+    $error = $queue->insert("root\@$qshellmachine", "[ -e $dir/.qmail-$qdomain-default ] || { touch $dir/.qmail-$qdomain-default; chown $uid:$gid $dir/.qmail-$qdomain-default; }" );
+
     }
   }
 
@@ -416,7 +424,7 @@ sub submit_internic {
 
 =head1 VERSION
 
-$Id: svc_domain.pm,v 1.22 2001-10-24 15:29:30 ivan Exp $
+$Id: svc_domain.pm,v 1.24 2002-02-20 01:03:09 ivan Exp $
 
 =head1 BUGS