Remove code to handle bug closures differently for NMUs or experimental uploads and...

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index dd3564d19746980f2983ae8d44ac01ec19ffddf1..b146c637badedc8fdb914e608d353b8eae2796f1 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -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 "4F368D5D";
+   SigningKeyIds "2D230C5F";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -14,7 +14,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
-   // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -36,6 +35,11 @@ Dinstall
    LegacyStableHasNoSections "false";
 };
 
+Process-Unchecked
+{
+  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+};
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -200,10 +204,10 @@ Suite
          sparc;
        };
        Announce "dak@security.debian.org";
-       Version "x.y";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian x.y Security Updates";
+       Description "Debian testing Security Updates";
        CodeName "etch";
        OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
@@ -217,6 +221,7 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
+  "silent-map etch-secure testing";
   "silent-map testing-security testing";
 };