projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix aradial usage import (Net::SFTP::Foreign and cachedir), RT#29053
[freeside.git]
/
bin
/
aradial-sftp_and_import
diff --git
a/bin/aradial-sftp_and_import
b/bin/aradial-sftp_and_import
old mode 100644
(file)
new mode 100755
(executable)
index
95546e4
..
1306712
--- a/
bin/aradial-sftp_and_import
+++ b/
bin/aradial-sftp_and_import
@@
-6,7
+6,8
@@
use strict;
use Getopt::Std;
use Text::CSV_XS;
use DBI;
use Getopt::Std;
use Text::CSV_XS;
use DBI;
-use FS::UID qw( adminsuidsetup datasrc );
+use Net::SFTP::Foreign;
+#use FS::UID qw( adminsuidsetup datasrc );
our %aradial2db = (
#'Date' => '',
our %aradial2db = (
#'Date' => '',
@@
-40,10
+41,11
@@
getopts('m:abr:dP:v:');
my %options = ();
my $user = shift or die &usage;
my %options = ();
my $user = shift or die &usage;
-adminsuidsetup $user;
+
#
adminsuidsetup $user;
-# %%%FREESIDE_CACHE%%%
-my $cachedir = '%%%FREESIDE_CACHE%%%/cache.'. datasrc. '/cdrs';
+# %%%FREESIDE_CACHE%%% & hardcoded datasrc
+#my $cachedir = '%%%FREESIDE_CACHE%%%/cache.'. datasrc. '/cdrs';
+my $cachedir = '/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cdrs';
mkdir $cachedir unless -d $cachedir;
my $servername = shift or die &usage;
mkdir $cachedir unless -d $cachedir;
my $servername = shift or die &usage;
@@
-188,7
+190,7
@@
sub usage {
"Usage:
aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
"Usage:
aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
- user
format [sftpuser@]servername
+ user
[sftpuser@]servername dbi_datasrc dbi_username dbi_pass
";
}
";
}
@@
-229,7
+231,7
@@
freeside-aradial-sftp_and_import - Download Aradial "CDR" (really RADIUS detail)
aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
- user
format
[sftpuser@]servername dbi_datasrc dbi_username dbi_pass
+ user [sftpuser@]servername dbi_datasrc dbi_username dbi_pass
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-253,8
+255,6
@@
or FTP and then import them into the database.
user: freeside username
user: freeside username
-format: CDR format name
-
[sftpuser@]servername: remote server
(or ftpuser:ftppass@servername)
[sftpuser@]servername: remote server
(or ftpuser:ftppass@servername)