From: Ryan Murray <rmurray@debian.org>
Date: Mon, 5 Jan 2004 02:16:07 +0000 (+0000)
Subject: update katie.conf-{security,non-US} for new signing keymove apt-ftparchive run from... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=46b4cf4e1cc9cc8da9bff94763d921b759c3e050;p=dak.git

update katie.conf-{security,non-US} for new signing keymove apt-ftparchive run from cron.buildd to cron.unchecked, to minimize somerace conditions.
---

diff --git a/cron.buildd b/cron.buildd
index 15e10a6f..4870e7ff 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -16,18 +16,6 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
 		rm -f "$LOCKFILE"
 	}
 	trap cleanup 0
-	psql projectb -A -t -q -c "SELECT filename FROM accepted_autobuild WHERE suite = 5 AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
-        cd $overridedir
-        denise &>/dev/null
-        rm -f override.sid.all3 override.sid.all3.src
-        for i in main contrib non-free main.debian-installer; do
-		cat override.sid.$i >> override.sid.all3
-		if [ "$i" != "main.debian-installer" ]; then
-			cat override.sid.$i.src >> override.sid.all3.src
-		fi
-	done
-	cd $masterdir
-	apt-ftparchive -qq generate apt.conf.buildd
 	cd /org/incoming.debian.org/buildd
 	cp /org/wanna-build/tmp/Sources.unstable-old Sources
 	gzip -cd Sources.gz >> Sources
diff --git a/cron.unchecked b/cron.unchecked
index 5f46244b..cfa216c1 100644
--- a/cron.unchecked
+++ b/cron.unchecked
@@ -16,4 +16,17 @@ if [ ! -z "$changes" ]; then
   echo "--" >> $report
 else
   echo "$timestamp": Nothing to do >> $report
-fi;
+fi
+
+psql projectb -A -t -q -c "SELECT filename FROM accepted_autobuild WHERE suite = 5 AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
+cd $overridedir
+denise &>/dev/null
+rm -f override.sid.all3 override.sid.all3.src
+for i in main contrib non-free main.debian-installer; do
+  cat override.sid.$i >> override.sid.all3
+  if [ "$i" != "main.debian-installer" ]; then
+    cat override.sid.$i.src >> override.sid.all3.src
+  fi
+done
+cd $masterdir
+apt-ftparchive -qq generate apt.conf.buildd &>/dev/null
diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4c81b7a2..d9beaf68 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "38C6029A";
+   SigningKeyIds "30B34DD5";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
diff --git a/katie.conf-security b/katie.conf-security
index bb9516d7..e3a305e0 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "722F1AED";
+   SigningKeyIds "30B34DD5";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";