X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Ftextradius.pm;h=07de875638f4107570ff6a78b10bf2459890d965;hb=ffa18709ee8a4d05e18d2d406cf73afe79e52524;hp=74807878b59eca653867ae52e202f78113213008;hpb=6dcf9258234427eb6cd6ad3e9912c4f1dac91ceb;p=freeside.git

diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm
index 74807878b..07de87563 100644
--- a/FS/FS/part_export/textradius.pm
+++ b/FS/FS/part_export/textradius.pm
@@ -1,13 +1,37 @@
 package FS::part_export::textradius;
 
-use vars qw(@ISA $prefix);
+use vars qw(@ISA %info $prefix);
 use Fcntl qw(:flock);
+use Tie::IxHash;
 use FS::UID qw(datasrc);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
-$prefix = "/usr/local/etc/freeside/export.";
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'users' => { label=>'users file location', default=>'/etc/raddb/users' },
+;
+
+%info = (
+  'svc'     => 'svc_acct',
+  'desc'    =>
+    'Real-time export to a text /etc/raddb/users file (Livingston, Cistron)',
+  'options' => \%options,
+  'default_svc_class' => 'Internet',
+  'notes'   => <<'END'
+This will edit a text RADIUS users file in place on a remote server.
+Requires installation of
+<a href="http://search.cpan.org/dist/RADIUS-UserFile">RADIUS::UserFile</a>
+from CPAN.  If using RADIUS::UserFile 1.01, make sure to apply
+<a href="http://rt.cpan.org/NoAuth/Bug.html?id=1210">this patch</a>.  Also
+make sure <a href="http://rsync.samba.org/">rsync</a> is installed on the
+remote machine, and <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.9:Documentation:Administration:SSH_Keys">SSH is setup for unattended
+operation</a>.
+END
+);
+
+$prefix = "%%%FREESIDE_CONF%%%/export.";
 
 sub rebless { shift; }
 
@@ -43,7 +67,7 @@ sub textradius_queue {
     'job'    => "FS::part_export::textradius::textradius_$method",
   };
   $queue->insert(
-    $self->option('user'),
+    $self->option('user')||'root',
     $self->machine,
     $self->option('users'),
     @_,
@@ -126,7 +150,13 @@ sub textradius_download {
   $rsync->exec( {
     src  => "$user\@$host:$users",
     dest => $dest,
-  } ) or die "error downloading $user\@$host:$users : ". $rsync->err;
+  } ); # true/false return value from exec is not working, alas
+  if ( $rsync->err ) {
+    die "error downloading $user\@$host:$users : ".
+        'exit status: '. $rsync->status. ', '.
+        'STDERR: '. join(" / ", $rsync->err). ', '.
+        'STDOUT: '. join(" / ", $rsync->out);
+  }
 
   $dest;
 }
@@ -145,10 +175,18 @@ sub textradius_upload {
   $rsync->exec( {
     src  => "$dir/users",
     dest => "$user\@$host:$users",
-  } ) or die "error uploading to $user\@$host:$users : ". $rsync->err;
+  } ); # true/false return value from exec is not working, alas
+  if ( $rsync->err ) {
+    die "error uploading to $user\@$host:$users : ".
+        'exit status: '. $rsync->status. ', '.
+        'STDERR: '. join(" / ", $rsync->err). ', '.
+        'STDOUT: '. join(" / ", $rsync->out);
+  }
 
   flock(LOCK,LOCK_UN);
   close LOCK;
 
 }
 
+1;
+