Stable update proposal: sitesummary 0.0.29
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of sitesummary in the stable
repository from 0.0.27 to 0.0.29. It fix a minor bug and make it
possible to report imediately to the collector without a random delay.
It also add a new report block (hostclass) in the default report.
Nothing major, and the change has been tested on several machines.
Here is the diff -r output between the two versions:
diff -ur sitesummary-0.0.27/debian/changelog sitesummary-0.0.29/debian/changelog
--- sitesummary-0.0.27/debian/changelog 2007-07-03 09:46:51.000000000 +0200
+++ sitesummary-0.0.29/debian/changelog 2007-10-13 10:02:57.000000000 +0200
@@ -1,3 +1,24 @@
+sitesummary (0.0.29) unstable; urgency=low
+
+ * Add get_hostclass() to the SiteSummary perl module API.
+ * Add host class summary to the default list of web reports.
+ * Fix typo in server cron job. Can't use nice on a shell function.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 13 Oct 2007 10:02:44 +0200
+
+sitesummary (0.0.28) unstable; urgency=low
+
+ [ Luk Claes ]
+ * Removed myself from uploaders.
+
+ [ Petter Reinholdtsen ]
+ * Make sure the server cron job do not report error when the package
+ is removed but not purged. (Closes: #445604)
+ * Move random sleep from the report script and into the cron script,
+ to make it possible to report imediately from a client.
+
+ -- Petter Reinholdtsen <pere@debian.org> Fri, 12 Oct 2007 19:10:09 +0200
+
sitesummary (0.0.27) unstable; urgency=low
* Modify the client code to sleep for a random number of seconds
diff -ur sitesummary-0.0.27/debian/control sitesummary-0.0.29/debian/control
--- sitesummary-0.0.27/debian/control 2007-07-03 09:24:21.000000000 +0200
+++ sitesummary-0.0.29/debian/control 2007-09-02 08:59:18.000000000 +0200
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
-Uploaders: Petter Reinholdtsen <pere@debian.org>, Morten Werner Olsen <werner@debian.org>, Luk Claes <luk@debian.org>, Steffen Joeris <white@debian.org>
+Uploaders: Petter Reinholdtsen <pere@debian.org>, Morten Werner Olsen <werner@debian.org>, Steffen Joeris <white@debian.org>
Build-Depends: debhelper (>= 4.1.0), cdbs
Standards-Version: 3.7.2
diff -ur sitesummary-0.0.27/debian/sitesummary-client.cron.daily sitesummary-0.0.29/debian/sitesummary-client.cron.daily
--- sitesummary-0.0.27/debian/sitesummary-client.cron.daily 2006-10-04 23:35:21.000000000 +0200
+++ sitesummary-0.0.29/debian/sitesummary-client.cron.daily 2007-10-12 17:35:43.000000000 +0200
@@ -2,5 +2,35 @@
#
# Author: Petter Reinholdtsen
+[ -x /usr/sbin/sitesummary-client ] || exit 0
+
+# Read the package default. Make sure this is identical to the code
+# in sitesummar-client
+[ -f /usr/share/sitesummary/sitesummary-client.conf ] && \
+ . /usr/share/sitesummary/sitesummary-client.conf
+for confdir in \
+ /usr/share/sitesummary/config.d \
+ /etc/sitesummary/config.d
+do
+ [ -d $confdir ] || continue
+ for config in $confdir/* ; do
+ [ -f $config ] && . $config
+ done
+done
+
+# Sleep a random number of seconds to avoid all clients connecting to
+# the server at the same time. Based on code from the cron-apt
+# package.
+if [ -n "$runsleep" ] ; then
+ if [ $runsleep -gt 0 ] ; then
+ if [ -z "$RANDOM" ] ; then
+ # A fix for shells that do not have this bash feature.
+ RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
+ fi
+ TIME=$(($RANDOM % $runsleep))
+ sleep $TIME
+ fi
+fi
+
# Run once a day to report the whereabouts of the machine
-[ -x /usr/sbin/sitesummary-client ] && nice /usr/sbin/sitesummary-client
+nice /usr/sbin/sitesummary-client
diff -ur sitesummary-0.0.27/sitesummary-client sitesummary-0.0.29/sitesummary-client
--- sitesummary-0.0.27/sitesummary-client 2007-07-03 00:45:41.000000000 +0200
+++ sitesummary-0.0.29/sitesummary-client 2007-10-12 17:34:51.000000000 +0200
@@ -53,21 +53,6 @@
done
done
-# Sleep a random number of seconds to avoid all clients connecting to
-# the server at the same time. Based on code from the cron-apt
-# package.
-if [ -n "$runsleep" ] ; then
- if [ $runsleep -gt 0 ] ; then
- if [ -z "$RANDOM" ] ; then
- # A fix for shells that do not have this bash feature.
- RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
- fi
- TIME=$(($RANDOM % $runsleep))
- sleep $TIME
- fi
-fi
-
-
mkdir $tmpdir && cd $tmpdir
for fragdir in $fragdirs ; do
diff -ur sitesummary-0.0.27/debian/sitesummary.cron.daily sitesummary-0.0.29/debian/sitesummary.cron.daily
--- sitesummary-0.0.27/debian/sitesummary.cron.daily 2007-05-31 12:55:54.000000000 +0200
+++ sitesummary-0.0.29/debian/sitesummary.cron.daily 2007-10-13 09:58:15.000000000 +0200
@@ -6,6 +6,7 @@
daylimit=120
makewebreport=/usr/sbin/sitesummary-makewebreport
+nodes=/usr/sbin/sitesummary-nodes
# Modify this in collector.cfg to /etc/munin/ to automatically replace
# the default munin configuration.
@@ -61,7 +62,7 @@
}
# Only enable if munin is installed.
-if [ -f /etc/munin/munin.conf ] ; then
+if [ -f /etc/munin/munin.conf ] && [ -x /usr/sbin/sitesummary-nodes ]; then
generate_munin_config
fi
Only in sitesummary-0.0.29: hostclass-summary
diff -ur sitesummary-0.0.27/Makefile sitesummary-0.0.29/Makefile
--- sitesummary-0.0.27/Makefile 2007-05-20 17:51:03.000000000 +0200
+++ sitesummary-0.0.29/Makefile 2007-10-12 19:14:47.000000000 +0200
@@ -22,6 +22,7 @@
SUMMARYSCRIPTS = \
site-summary \
+ hostclass-summary \
kernelversion-summary \
debian_edu-summary
diff -ur sitesummary-0.0.27/sitesummary-makewebreport sitesummary-0.0.29/sitesummary-makewebreport
--- sitesummary-0.0.27/sitesummary-makewebreport 2006-10-04 23:41:11.000000000 +0200
+++ sitesummary-0.0.29/sitesummary-makewebreport 2007-10-13 10:05:31.000000000 +0200
@@ -15,7 +15,7 @@
<pre>
EOF
-for f in site-summary kernelversion-summary debian_edu-summary ; do
+for f in site-summary hostclass-summary kernelversion-summary debian_edu-summary ; do
/usr/lib/sitesummary/$f
echo
done
diff -ur sitesummary-0.0.27/SiteSummary.pm sitesummary-0.0.29/SiteSummary.pm
--- sitesummary-0.0.27/SiteSummary.pm 2007-05-20 17:41:44.000000000 +0200
+++ sitesummary-0.0.29/SiteSummary.pm 2007-10-12 19:26:13.000000000 +0200
@@ -10,6 +10,7 @@
our @EXPORT = qw(
for_all_hosts
get_filepath_current
+ get_hostclass
get_site
get_sitegroup
get_hostname
@@ -66,6 +67,14 @@
}
#
+# Return the hostclass string
+#
+sub get_hostclass {
+ my $hostid = shift;
+ return get_file_string($hostid, "/siteinfo/hostclass");
+}
+
+#
# Return the hostname string
#
sub get_hostname {
Reply to: