Merge commit 'ftpmaster/master'

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b1ee215de817d835b3f4087fb767f8d7b439b3ed..b254a7ad5ad8a4243887065934c5325a1efd991b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,15 +1,16 @@
 Dinstall
 {
    GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
-      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
+      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
-   MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   SigningKeyIds "55BE302B";
+//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
+   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
+   MyEmailAddress "Archive Administrator <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -25,7 +26,7 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
-   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
+   LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags";
    QueueBuildSuites
    {
      unstable;
@@ -47,6 +48,7 @@ Dinstall
 
 Transitions
 {
+   Notifications "debian-devel@lists.debian.org";
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
@@ -93,7 +95,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
 };
 
 Clean-Queues
@@ -136,7 +138,7 @@ Import-Archive
 
 Import-Keyring
 {
-  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
     {
       Debian-Maintainer "true";
     };
@@ -172,7 +174,8 @@ Clean-Suites
 
 Process-New
 {
-  AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock";
+  LockDir "/srv/ftp.debian.org/lock/new/";
 };
 
 Check-Overrides
@@ -214,7 +217,6 @@ Suite
        CodeName "etch";
        OverrideCodeName "etch";
        Priority "5";
-       Untouchable "1";
        ChangeLogBase "dists/oldstable/";
        UdebComponents
        {
@@ -282,7 +284,6 @@ Suite
        CodeName "lenny";
        OverrideCodeName "lenny";
        Priority "5";
-       Untouchable "1";
        ChangeLogBase "dists/stable/";
        UdebComponents
        {
@@ -315,14 +316,15 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
          };
-         MustBeOlderThan
-         {
-           Testing;
-           Unstable;
-           Experimental;
-         };
+//       MustBeOlderThan
+//       {
+//         Testing;
+//         Unstable;
+//         Experimental;
+//       };
          Enhances
           {
            Stable;
@@ -377,8 +379,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
          };
          MustBeOlderThan
@@ -438,8 +441,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
          };
@@ -472,8 +476,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
            Unstable;
@@ -493,6 +498,11 @@ SuiteMappings
  "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
+ "map etch oldstable";
+ "map lenny stable";
+ "map squeeze testing";
+ "map sid unstable";
+ "map rc-buggy experimental";
  "map oldstable oldstable-proposed-updates";
  "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
@@ -505,6 +515,7 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+ "reject etch-m68k";
 };
 
 AutomaticByHandPackages {
@@ -515,13 +526,6 @@ AutomaticByHandPackages {
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
   };
 
-  "debian-maintainers" {
-    Source "debian-maintainers";
-    Section "raw-keyring";
-    Extension "gpg";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm";
-  };
-
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";
@@ -562,7 +566,11 @@ Dir
     New "/srv/ftp.debian.org/queue/new/";
     Reject "/srv/ftp.debian.org/queue/reject/";
     Unchecked "/srv/ftp.debian.org/queue/unchecked/";
+    Newstage "/srv/ftp.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
+    Embargoed "/does/not/exist/";
+    Unembargoed "/does/not/exist/";
+    Disembargo "/does/not/exist/";
   };
 };
 
@@ -598,8 +606,9 @@ Architectures
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
   s390 "IBM S/390";
-  sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
+  kfreebsd-i386 "GNU/kFreeBSD i386";
+  kfreebsd-amd64 "GNU/kFreeBSD amd64";
 };
 
 Archive
@@ -636,31 +645,45 @@ Component
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
   embedded;
   electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -668,7 +691,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
+  xfce;
+  zope;
 };
 
 Priority
@@ -712,3 +739,9 @@ Urgency
     critical;
   };
 };
+
+Contents
+{
+  Header "contents";
+  Root "/srv/ftp.debian.org/test/";
+}