From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 4 Jan 2013 13:53:51 +0000 (+0000)
Subject: Merge branch 'master' of ssh://kebab.indexdata.dk:222/home/git/pub/git-tools
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=a7efd4d7ca25565c8fb8e9a84892abb6adfbb6d3;hp=b1836dc33d18924626869de506fb2f9d0430d0a3;p=git-tools-moved-to-github.git

Merge branch 'master' of ssh://kebab.indexdata.dk:222/home/git/pub/git-tools
---

diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index 2dac01a..3d70053 100755
--- a/aptcheck/aptcheck.pl
+++ b/aptcheck/aptcheck.pl
@@ -21,6 +21,7 @@
 # 15-Aug-2011 Heikki: Adding a total in the headline, for nagiosgrapher
 # 21-May-2012 Heikki: Added a date since when a package has been pending
 # 31-May-2012 Heikki: Pointing to the new wiki
+# 01-Jan-2013 Heikki: Get hosts from nagios-us as well.
 #
 # TODO: Assumes that we release our restricted packages for all versions
 # and architectures at the same time. Gets only the highest version from
@@ -52,10 +53,15 @@ my %hostcomments = (
 # I could use a hard-coded list, but I would forget to maintain it.
 # Nagios knows most of our hosts. It even knows which are worth 
 # checking, they have a command to check apts!
+print "Getting hostlist from nagios\n" if $debug;
+my $hostlist1 = `ssh nagios grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg`
+  or die "Could not get host list from nagios (dk)";
 
-my $hostlist = `ssh nagios grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg`
-  or die "Could not get host list";
+print "Getting hostlist from nagios-us\n" if $debug;
+my $hostlist2 = `ssh nagios-us grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg`
+  or die "Could not get host list from nagios (dk)";
 
+my $hostlist = $hostlist1 . $hostlist2;
 print "Got list:\n$hostlist\n" if $debug>2;
 
 ###### Get list of packages that can be manually maintained
diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 4885ecb..f2c6bba 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -18,7 +18,7 @@ CCACHEDIR=
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
+    quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
 	# MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
 	MIRRORSITE="http://mirrors.dotsrc.org/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index ed519ab..e982046 100755
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -16,7 +16,7 @@ confdir=`pwd`
 architectures="i386 amd64"
 
 for vdist in ubuntu/lucid \
-	ubuntu/natty ubuntu/oneiric ubuntu/precise \
+	ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal \
 	debian/wheezy debian/squeeze; do
 	dist=`basename $vdist`
 	vendor=`dirname $vdist`