2007-08-02 Sancho Lerena <slerena@gmail.com>

* lib: Linked to bin/PandoraFMS, for use in Makefile.PL

        * Makefile.PL: Perl standard interface for make (to install)

        * bin/pandora_db.pl: Some small fixes and information strings updated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2007-08-02 17:25:59 +00:00
parent d55e219c23
commit 1af92f6725
5 changed files with 45 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2007-08-02 Sancho Lerena <slerena@gmail.com>
* lib: Linked to bin/PandoraFMS, for use in Makefile.PL
* Makefile.PL: Perl standard interface for make (to install)
* bin/pandora_db.pl: Some small fixes and information strings updated.
2007-07-31 Sancho Lerena <slerena@gmail.com>
* util/snmptrapd: Deleted binary.

View File

@ -0,0 +1,27 @@
use 5.000;
use ExtUtils::MakeMaker;
WriteMakefile(
NAME => 'PandoraFMS',
VERSION_FROM => 'bin/PandoraFMS/Config.pm',
AUTHOR => 'Sancho Lerena <slerena@gmail.com>',
PREREQ_PM => {
DBI => 0,
threads::shared => 0,
IO::Socket => 0,
Time::Format => 0,
Time::Local => 0,
Date::Manip => 0,
XML::Simple => 0,
Net::Ping => 0,
Time::HiRes => 0,
IO::Socket => 0,
SNMP => 0
},
EXE_FILES =>
[ 'bin/pandora_server.pl', 'bin/pandora_network.pl', 'bin/pandora_recon.pl', 'bin/pandora_snmpconsole.pl'],
PMLIBDIRS => [ 'lib' ],
'dist' => { 'TAR' => 'tar', 'TARFLAGS' => 'cvfz', 'SUFFIX'
=> '.gz', 'COMPRESS' => 'gzip'}
);

View File

@ -36,7 +36,7 @@ our @EXPORT = qw( pandora_help_screen
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "1.3-dev";
my $pandora_build="PS070731";
our $VERSION = $pandora_version;
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
my %pa_config;

View File

@ -0,0 +1 @@
../bin/PandoraFMS/

View File

@ -32,7 +32,7 @@ my $dirname="";
my $dbname = 'pandora';
my $dbhost ='';
my $dbuser ='';
my $verbosity ='';
my $verbosity =0;
my $dbpass='';
my $server_threshold='';
my $log_file="";
@ -249,8 +249,9 @@ sub pandora_compactdb {
##############################################################################
sub pandora_init {
printf "\nPandora DB $version, <slerena\@gmail.com>\n";
printf "This program is GPL Licensed, please use it freely\n";
print "\nPandora FMS DB Tool $version Copyright (c) 2004-2007 ArticaST\n";
print "This program is Free Software, licensed under the terms of GPL License v2\n";
print "You can download latest versions and documentation at http://pandora.sourceforge.net\n";
# Load config file from command line
if ($#ARGV == -1 ){
@ -268,6 +269,7 @@ sub pandora_init {
elsif ($parametro =~ m/--help\z/i ) { help_screen(); }
elsif ($parametro =~ m/-v\z/i) { $verbosity=5; }
elsif ($parametro =~ m/-d\z/i) { $verbosity=10; }
elsif ($parametro =~ m/-d\z/i) { $verbosity=0; }
else { ($pandora_path = $parametro); }
}
if ($pandora_path eq ""){
@ -323,7 +325,6 @@ sub pandora_loadconfig {
elsif ($parametro =~ m/dbname\z/) { $dbname = $args[$ax+1]; $ax++; }
elsif ($parametro =~ m/dbhost\z/) { $dbhost = $args[$ax+1]; $ax++; }
elsif ($parametro =~ m/log_file\z/) { $log_file = $args[$ax+1]; $ax++; }
elsif ($parametro =~ m/verbosity\z/) { $verbosity = $args[$ax+1]; $ax++; }
elsif ($parametro =~ m/server_threshold\z/) { $server_threshold = $args[$ax+1]; $ax++; }
}
@ -387,6 +388,9 @@ sub pandora_loadconfig {
sub help_screen{
printf "\n\nSintax: \n pandora_db.pl fullpathname_to_pandora_server.conf \n\n";
print " -d Debug output (very verbose) \n";
print " -v Verbose output \n";
print " -q Quiet output \n";
exit;
}