Merge commit 'ftpmaster/master'

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 24282855466fc334e6177303fed695192d82ed91..b254a7ad5ad8a4243887065934c5325a1efd991b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -3,13 +3,14 @@ Dinstall
    GPGKeyring {
       "/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
@@ -313,6 +316,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
          };
 //       MustBeOlderThan
@@ -375,6 +379,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -436,6 +441,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -470,6 +476,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -491,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";
@@ -514,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";
@@ -561,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/";
   };
 };
 
@@ -597,7 +606,6 @@ 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";