X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=8c5c1fb54af164905e97fbac0f97c635e471399b;hb=bfdfe34b68b54ac28b8f92365e2b31b78285455a;hp=53d5f61fc6bd7245abf65432c5a4f3b59741c65e;hpb=f2d6241dcdbd579e44dc70b0e76f03ea2a309708;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 53d5f61f..8c5c1fb5 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -38,6 +38,7 @@ Generate-Index-Diffs
 {
    Options
    {
+     Archive "ftp-master";
      TempDir "/srv/ftp-master.debian.org/tiffani";
      MaxDiffs { Default 56; };
    };
@@ -59,7 +60,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser";
+  KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup";
 };
 
 Clean-Queues
@@ -97,7 +98,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
-  CACertFile "/etc/ssl/certs/spi-cacert-2008.pem";
+  CACertFile "/etc/ssl/servicecerts/db.debian.org.crt";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -109,8 +110,6 @@ Import-LDAP-Fingerprints
 
 Clean-Suites
 {
-  // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "pool";
 };
 
@@ -151,6 +150,10 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+
+ "reject oldstable-proposed-updates";
+ "reject jessie-backports";
+ "reject jessie-updates";
 };
 
 AutomaticByHandPackages {