Title: [opsview] [11739] Install any Opspacks when upgrading on Debian.
- Revision
- 11739
- Author
- pknight
- Date
- 2013-03-12 12:24:10 +0000 (Tue, 12 Mar 2013)
Log Message
Install any Opspacks when upgrading on Debian.
Modified Paths
Modified: trunk/opsview-core/debian/postinst
===================================================================
--- trunk/opsview-core/debian/postinst 2013-03-12 09:39:22 UTC (rev 11738)
+++ trunk/opsview-core/debian/postinst 2013-03-12 12:24:10 UTC (rev 11739)
@@ -45,7 +45,7 @@
proceed=0
db_subst opsview-core/db_rootpass db $1
- while [ ${proceed} -eq 0 ]; do
+ while [ ${proceed} -eq 0 ]; do
# Only prompts on db_go
# This works quite nicely because $RET will be empty, which is default mysql root
# so a fresh install should just work
@@ -55,7 +55,7 @@
# Try to connect
echo exit | mysql -u root --password="${mysql_root_pw}" -h "$2" > /dev/null 2>&1
retval=$?
-
+
if [ ${retval} -ne 0 ]; then
echo "Failed to connect to database - requesting root password" >&2
db_reset opsview-core/db_rootpass
@@ -65,7 +65,7 @@
proceed=1
fi
done
-
+
return ${retval};
}
@@ -86,7 +86,7 @@
# Only prompt for root for databases on localhost
db_getroot $db "localhost" || exit 1
-
+
# Don't need to specify host in db_mysql, because uses opsview.conf automatically
su - nagios -c "/usr/local/nagios/bin/db_mysql -u root -p '${mysql_root_pw}' $db" > /dev/null
if [ $? -ne 0 ] ; then
@@ -103,13 +103,14 @@
su - nagios -c "/usr/local/nagios/bin/db_$db db_install" || exit 1
fi
done
-
+
# Remove passwords from database
db_clear
db_unregister opsview-core/db_rootpass
if [ $opsview_upgrade -eq 1 ]; then
su - nagios -c '/usr/local/nagios/bin/populate_db.pl'
+ su - nagios -c '/usr/local/nagios/bin/install_all_opspacks --dir /usr/local/nagios/import/opspacks'
fi
# NOSTART so Debian will startup daemon itself
Modified: trunk/opsview-core/installer/upgradedb.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb.pl 2013-03-12 09:39:22 UTC (rev 11738)
+++ trunk/opsview-core/installer/upgradedb.pl 2013-03-12 12:24:10 UTC (rev 11739)
@@ -27,6 +27,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+# Note that this script is not called from a Debian system. postinst does this
+# work, instead.
+
use strict;
use warnings;
use FindBin qw($Bin);
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
