X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=741a4a1144c2e48e19916081562556a9312a3384;hb=2995b12ed8532812a6ca60fe97aaea69a8afca53;hp=89b839c4744ffbe2264f3cca3ef222d84e6573b2;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 89b839c4..741a4a11 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "4F368D5D";
+   SigningKeyIds "2D230C5F";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -34,7 +34,7 @@ Dinstall
    };
 };
 
-Tiffani
+Generate-Index-Diffs
 {
    Options
    {
@@ -43,12 +43,12 @@ Tiffani
    };
 };
 
-Alicia
+Override
 {
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
-Billie
+Mirror-Split
 {
   FTPPath "/org/ftp.debian.org/ftp";
   TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
@@ -62,23 +62,23 @@ Billie
   };
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie";
+  KnownPostgres "postgres,dak,katie";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queues";
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -90,7 +90,7 @@ Natalie
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -102,18 +102,18 @@ Melanie
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/ftp.debian.org/katie/neve-files/";
+  ExportDir "/org/ftp.debian.org/dak/import-archive-files/";
 };
 
-Lauren
+Reject-Proposed-Updates
 {
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.1r2/";
+   StableRejector "Andreas Barth and Martin Zobel-Helas";
+   MoreInfoURL "http://release.debian.org/stable/3.1/3.1r2/";
 };
 
-Emilie
+Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
@@ -126,20 +126,20 @@ Emilie
   KeyServer "wwwkeys.eu.pgp.net";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   QueueBuildStayOfExecution 86400; // 24 hours
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
-Lisa
+Process-New
 {
   AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
 };
 
-Cindy
+Check-Overrides
 {
   OverrideSuites
   {
@@ -222,9 +222,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.1r1";
+	Version "3.1r2";
 	Origin "Debian";
-	Description "Debian 3.1r1 Released 17 December 2005";
+	Description "Debian 3.1r2 Released 17 April 2006";
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "3";
@@ -262,7 +262,7 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
+	CopyDotDak "/org/ftp.debian.org/queue/proposed-updates/";
 	Version "3.1-updates";
 	Origin "Debian";
 	Description "Debian 3.1 Proposed Updates - Not Released";
@@ -306,6 +306,7 @@ Suite
 	  source;
 	  all;
 	  alpha;
+	  amd64;
 	  arm;
 	  hppa;
 	  i386;
@@ -342,6 +343,7 @@ Suite
 	  source;
 	  all;
 	  alpha;
+	  amd64;
 	  arm;
 	  hppa;
 	  i386;
@@ -397,6 +399,7 @@ Suite
 	  source;
 	  all;
 	  alpha;
+	  amd64;
 	  arm;
 	  hppa;
 	  hurd-i386;
@@ -407,7 +410,6 @@ Suite
 	  mipsel;
 	  powerpc;
 	  s390;
-	  sh;
 	  sparc;
 	};
 	Announce "debian-devel-changes@lists.debian.org";
@@ -445,6 +447,7 @@ Suite
 	  source;
 	  all;
 	  alpha;
+	  amd64;
 	  arm;
 	  hppa;
 	  hurd-i386;
@@ -455,7 +458,6 @@ Suite
 	  mipsel;
 	  powerpc;
 	  s390;
-	  sh;
 	  sparc;
 	};
 	Announce "debian-devel-changes@lists.debian.org";
@@ -466,7 +468,6 @@ Suite
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
-        Tree "project/experimental";
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -501,7 +502,7 @@ Dir
 {
   Root "/org/ftp.debian.org/ftp/";
   Pool "/org/ftp.debian.org/ftp/pool/";
-  Templates "/org/ftp.debian.org/katie/templates/";
+  Templates "/org/ftp.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/org/ftp.debian.org/database/dists/";
   Log "/org/ftp.debian.org/log/";
@@ -515,6 +516,7 @@ Dir
   {
     Accepted "/org/ftp.debian.org/queue/accepted/";
     Byhand "/org/ftp.debian.org/queue/byhand/";
+    ProposedUpdates "/org/ftp.debian.org/queue/p-u-new/";
     Done "/org/ftp.debian.org/queue/done/";
     Holding "/org/ftp.debian.org/queue/holding/";
     New "/org/ftp.debian.org/queue/new/";
@@ -544,6 +546,7 @@ Architectures
   alpha "DEC Alpha";
   hurd-i386 "Intel ia32 running the HURD";
   hppa "HP PA RISC";
+  amd64 "AMD64";
   arm "ARM";
   i386 "Intel ia32";
   ia64 "Intel ia64";