Title: [opsview] [11623] install_all_opspacks now includes lib path ?\226?\128?\148 no need to keep specifying PERL5LIB.
- Revision
- 11623
- Author
- pknight
- Date
- 2013-02-28 14:09:13 +0000 (Thu, 28 Feb 2013)
Log Message
install_all_opspacks now includes lib path ?\226?\128?\148 no need to keep specifying PERL5LIB.
It's also called in the upgradedb.pl script, so Opspacks get installed when upgrading Opsview.
Modified Paths
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2013-02-28 13:41:34 UTC (rev 11622)
+++ trunk/opsview-core/bin/db_opsview 2013-02-28 14:09:13 UTC (rev 11623)
@@ -1292,7 +1292,7 @@
if [ $NOPACKS -eq 0 ] ; then
# install opspacks
- PERL5LIB="/usr/local/nagios/lib:/usr/local/nagios/perl/lib:/opt/opsview/perl/lib/perl5" install_all_opspacks --force --dir $topdir/../import/opspacks || die "Cannot install all opspacks - check log"
+ install_all_opspacks --force --dir $topdir/../import/opspacks || die "Cannot install all opspacks - check log"
if [ $TEST -eq 0 ] ; then
PERL5LIB="/usr/local/nagios/lib:/usr/local/nagios/perl/lib:/opt/opsview/perl/lib/perl5" $topdir/../import/opsview_master_post_opspacks $topdir/../import/opsview_master.def;
fi
@@ -1300,6 +1300,7 @@
else
echo "Skipping OpsPacks installation";
fi
+
}
function db_backup {
Modified: trunk/opsview-core/bin/install_all_opspacks
===================================================================
--- trunk/opsview-core/bin/install_all_opspacks 2013-02-28 13:41:34 UTC (rev 11622)
+++ trunk/opsview-core/bin/install_all_opspacks 2013-02-28 14:09:13 UTC (rev 11623)
@@ -1,10 +1,10 @@
#!/usr/bin/perl
+use strict;
use warnings;
-use strict;
use FindBin qw($Bin);
-use lib "$Bin/../lib", "$Bin/../etc", "$Bin/../perl/lib";
-
+use lib "$Bin/../lib", "$Bin/../etc", "$Bin/../perl/lib",
+ '/opt/opsview/perl/lib/perl5';
use Getopt::Long;
use Opsview::Schema;
@@ -16,7 +16,7 @@
my $schema = Opsview::Schema->my_connect;
my $force = 0;
-my $dir = "/usr/local/nagios/var/spool/opspacks";
+my $dir = "$Bin/../var/spool/opspacks";
GetOptions(
"force" => \$force,
Modified: trunk/opsview-core/installer/upgradedb.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb.pl 2013-02-28 13:41:34 UTC (rev 11622)
+++ trunk/opsview-core/installer/upgradedb.pl 2013-02-28 14:09:13 UTC (rev 11623)
@@ -34,3 +34,5 @@
foreach my $db (qw(opsview runtime)) {
system("$Bin/upgradedb_$db.pl 2>&1") == 0 or die "upgrade failed";
}
+
+`$Bin/../bin/install_all_opspacks --force --dir /usr/local/nagios/import/opspacks`;
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
