remove lenny

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 11823b8e83ed595f7a886758e384e598eeeff74f..c5ad1ca1ca4bcb2cb36a3096a353c10e831a6ce6 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security-master.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -51,14 +50,6 @@ Queue-Report
   };
 };
 
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -135,25 +126,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  OldStable
-  {
-       Components 
-       {
-         updates/main;
-         updates/contrib;
-         updates/non-free;
-       };
-       Announce "dak@security.debian.org";
-       Version "";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 5.0 Security Updates";
-       ValidTime 864000; // 10 days
-       CodeName "lenny";
-       OverrideCodeName "lenny";
-       CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-
   Stable
   {
        Components
@@ -197,12 +169,8 @@ SuiteMappings
 {
  "silent-map stable-security stable";
  "silent-map oldstable-security oldstable";
- // JT - FIXME, hackorama
- // "silent-map testing-security stable";
   "silent-map etch-secure oldstable";
-  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
-  "silent-map lenny-security oldstable";
   "silent-map squeeze-security stable";
   "silent-map wheezy-security testing";
 };
@@ -225,12 +193,12 @@ Dir
   TempPath "/srv/security-master.debian.org/tmp";
   Holding "/srv/security-master.debian.org/queue/holding/";
   Done "/srv/security-master.debian.org/queue/done/";
+  Reject "/srv/security-master.debian.org/queue/reject/";
 
   Queue
   {
     Byhand "/srv/security-master.debian.org/queue/byhand/";
     New "/srv/security-master.debian.org/queue/new/";
-    Reject "/srv/security-master.debian.org/queue/reject/";
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
     Newstage "/srv/security-master.debian.org/queue/newstage/";