Merge remote branch 'ftpmaster/master'

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fc4017d7cf26f03c7778c980b95c893221d603cc..fb23848eed79e396c039234f06554070a12ae081 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -236,7 +236,6 @@ Dir
   Lists "/srv/security-master.debian.org/dak-database/dists/";
   Log "/srv/security-master.debian.org/dak-log/";
   Morgue "/srv/security-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/security-master.debian.org/scripts/override/";
   QueueBuild "/srv/security-master.debian.org/buildd/";
   Upload "/srv/queued/ftpmaster/";
@@ -305,29 +304,6 @@ Archive
 
 };
 
-Component
-{
-
-  updates/main
-  {
-       Description "Main (updates)";
-       MeetsDFSG "true";
-  };
-
-  updates/contrib
-  {
-       Description "Contrib (updates)";
-       MeetsDFSG "true";
-  };
-
-  updates/non-free
-  {
-       Description "Software that fails to meet the DFSG";
-       MeetsDFSG "false";
-  };
-
-};
-
 ComponentMappings
 {
  "main updates/main";
@@ -404,28 +380,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  /srv/security-master.debian.org/ftp/pool/
-    {
-      Archive "security";
-      Suites 
-       {
-         OldStable;
-         Stable;
-         Testing;
-        };
-      Type "pool";
-    };
-};
-
 Urgency
 {
   Default "low";