Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / bin / freeside-voipinnovations-cdrimport

diff --git a/FS/bin/freeside-voipinnovations-cdrimport b/FS/bin/freeside-voipinnovations-cdrimport
index 484b330..d64c870 100755 (executable)
--- a/FS/bin/freeside-voipinnovations-cdrimport
+++ b/FS/bin/freeside-voipinnovations-cdrimport
@@ -4,7 +4,8 @@ use strict;
 use Getopt::Std;
 use Date::Format;
 use File::Temp 'tempdir';
-use Net::FTP;
+use Net::SSLGlue::FTP; #at least until the Deb 9 transition is done, then
+                       # regular Net::FTP has SSL support
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::cdr;
 use FS::cdr_batch;
@@ -37,13 +38,16 @@ my %exists = map {$_->cdrbatch => 1} @previous;
 my $tempdir = tempdir( CLEANUP => !$opt_v );
 
 my $format = 'voip_innovations';
-my $hostname = 'cdrs.globalpopsvoip.com';
+my $hostname = 'customercdr.voipinnovations.com';
 
-my $ftp = Net::FTP->new($hostname, Debug => $opt_d)
+my $ftp = Net::FTP->new($hostname, Passive => 1, Debug => $opt_d)
   or die "Can't connect to $hostname: $@\n";
 
+$ftp->starttls()
+  or die "TLS initialization failed: ". $ftp->message. "\n";
+
 $ftp->login($login, $password)
-  or die "Login failed: ".$ftp->message."\n";
+  or die "Login failed: ". $ftp->message. "\n";
 
 ###
 # get the file list
@@ -51,7 +55,7 @@ $ftp->login($login, $password)
 
 warn "Retrieving directory listing\n" if $opt_v;
 
-$ftp->cwd('/');
+#$ftp->cwd('/');
 my @dirs = $ftp->ls();
 warn scalar(@dirs)." directories found.\n" if $opt_v;
 # apply date range