X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=c1b6c94e1bff98f93e0aa71ab1e23f83efe06222;hb=1bbc46bb933a97c90a4c36b621c7e202398e2d8d;hp=aa729c37675f667200cda973df0337ecd2921b95;hpb=5229fa5525b627414d96fe11b8f6853d3d58d29e;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index aa729c37..c1b6c94e 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -3,7 +3,6 @@ Dinstall
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -32,6 +31,11 @@ Process-New
   LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
+Process-Policy
+{
+  CopyDir "/srv/security-master.debian.org/queue/accepted";
+};
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -126,25 +130,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
@@ -188,18 +173,15 @@ 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";
 };
 
 Dir
 {
+  Base "/srv/security-master.debian.org/";
   Root "/srv/security-master.debian.org/ftp/";
   Pool "/srv/security-master.debian.org/ftp/pool/";
   Export "/srv/security-master.debian.org/export/";