X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=58a54f0a073ed2608dfe5a066f19e247c4a4e0fd;hb=9ccdb0cd4d66fc274d4f69e4c5870c017be4e5b7;hp=1da7d3557e5d0e7f3654fbb62c99cb2504e52531;hpb=695759e80feca4d6b2c27143a076d5e2ddf90339;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 1da7d355..58a54f0a 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -12,8 +12,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "false";
    OverrideDisparityCheck "false";
@@ -40,7 +38,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,www-data,udmsearch,repuser";
+  KnownPostgres "postgres,dak,www-data,udmsearch,repuser,debian-backup";
 };
 
 Queue-Report
@@ -58,6 +56,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
+  CACertFile "/etc/ssl/certs/spi-cacert-2008.pem";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -125,50 +124,6 @@ Security-Install
   };
 };
 
-Suite
-{
-  // Priority determines which suite is used for the Maintainers file
-  // as generated by 'dak make-maintainers' (highest wins).
-
-  Stable
-  {
-	Components
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Announce "dak@security.debian.org";
-	Version "";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 6.0 Security Updates";
-	ValidTime 864000; // 10 days
-	CodeName "squeeze";
-	OverrideCodeName "squeeze";
-	CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-
-  Testing
-  {
-	Components
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Announce "dak@security.debian.org";
-	Version "";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian testing Security Updates";
-	ValidTime 864000; // 10 days
-	CodeName "wheezy";
-	OverrideCodeName "wheezy";
-	CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-};
-
 SuiteMappings
 {
  "silent-map stable-security stable";
@@ -203,14 +158,6 @@ Dir
 
   Queue
   {
-    Byhand "/srv/security-master.debian.org/queue/byhand/";
-    New "/srv/security-master.debian.org/queue/new/";
-    Unchecked "/srv/security-master.debian.org/queue/unchecked/";
-    Newstage "/srv/security-master.debian.org/queue/newstage/";
-
-    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
-
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";
     Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/";
@@ -228,40 +175,6 @@ DB
   Unicode "false"
 };
 
-Architectures
-{
-
-  source "Source";
-  all "Architecture Independent";
-  alpha "DEC Alpha";
-  hppa "HP PA RISC";
-  arm "ARM";
-  armel "ARM EABI";
-  i386 "Intel ia32";
-  ia64 "Intel ia64";
-  mips "MIPS (Big Endian)";
-  mipsel "MIPS (Little Endian)";
-  powerpc "PowerPC";
-  s390 "IBM S/390";
-  sparc "Sun SPARC/UltraSPARC";
-  amd64 "AMD x86_64 (AMD64)";
-  kfreebsd-i386 "GNU/kFreeBSD i386";
-  kfreebsd-amd64 "GNU/kFreeBSD amd64";
-
-};
-
-Archive
-{
-
-  security
-  {
-    OriginServer "security.debian.org";
-    PrimaryMirror "security.debian.org";
-    Description "Security Updates for the Debian project";
-  };
-
-};
-
 ComponentMappings
 {
  "main updates/main";
@@ -272,72 +185,6 @@ ComponentMappings
  "non-US/non-free updates/non-free";
 };
 
-Section
-{
-  admin;
-  cli-mono;
-  comm;
-  database;
-  debian-installer;
-  debug;
-  devel;
-  doc;
-  editors;
-  embedded;
-  electronics;
-  fonts;
-  games;
-  gnome;
-  graphics;
-  gnu-r;
-  gnustep;
-  hamradio;
-  haskell;
-  httpd;
-  interpreters;
-  java;
-  kde;
-  kernel;
-  libdevel;
-  libs;
-  lisp;
-  localization;
-  mail;
-  math;
-  misc;
-  net;
-  news;
-  ocaml;
-  oldlibs;
-  otherosfs;
-  perl;
-  php;
-  python;
-  ruby;
-  science;
-  shells;
-  sound;
-  tex;
-  text;
-  utils;
-  web;
-  vcs;
-  video;
-  x11;
-  xfce;
-  zope;
-};
-
-Priority
-{
-  required 1;
-  important 2;
-  standard 3;
-  optional 4;
-  extra 5;
-  source 0; // i.e. unused
-};
-
 Urgency
 {
   Default "low";
@@ -350,25 +197,3 @@ Urgency
     critical;
   };
 };
-
-Generate-Releases
-{
-  MD5Sum
-  {
-    oldstable;
-    stable;
-    testing;
-  };
-  SHA1
-  {
-    oldstable;
-    stable;
-    testing;
-  };
-  SHA256
-  {
-    oldstable;
-    stable;
-    testing;
-  };
-}