Merge branch 'master' into bpo

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index f6af14410515df3168e5f2bc7dd87be70dd6f569..422dce6159698c1b3cdcc0af8dd8f8c976931a5e 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -9,7 +9,7 @@ Dinstall
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "16BA136C 55BE302B";
+   SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
    MyAdminAddress "ftpmaster@backports.debian.org";
@@ -26,7 +26,7 @@ Dinstall
    LockFile "/srv/backports-master.debian.org/lock/dinstall.lock";
    // If defined this address gets a bcc of all mails.
    // FIXME: Einrichten wenn das hier produktiv geht!
-   Bcc "backports-archive@lists.backports.org";
+   Bcc "debian-backports-changes@lists.debian.org";
    GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
@@ -231,7 +231,7 @@ Suite
          contrib;
          non-free;
        };
-       Announce "backports-changes@lists.backports.org";
+       Announce "debian-backports-changes@lists.debian.org";
        Origin "backports.debian.org archive";
        Description "Backports for the Etch Distribution";
        CodeName "etch-backports";
@@ -249,6 +249,7 @@ Dir
   Templates "/srv/backports-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
+  Cache "/srv/backports-master.debian.org/database/";
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";