X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=ad47e337b81946d1d8236b6daca6fb8b1d3b6d1c;hb=773f4286615587294d6e6acfb850df53a661bbc5;hp=ba9474e5da3c537931130159a52b5e42496359ab;hpb=ec2ed5be064ce6bff8dcab88fee1762d38c409b9;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ba9474e5..ad47e337 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -36,7 +36,7 @@ Process-Policy
 
 Import-Users-From-Passwd
 {
-  ValidGID "800";
+  ValidGID "Debian";
   // Comma separated list of users who are in Postgres but not the passwd file
   KnownPostgres "postgres,dak,www-data,udmsearch,repuser,debian-backup";
 };
@@ -56,7 +56,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
-  CACertFile "/etc/ssl/servicecerts/db.debian.org.crt";
+  CACertFile "/etc/ssl/ca-debian/ca-certificates.crt";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -124,12 +124,17 @@ Security-Install
 SuiteMappings
 {
  "silent-map stable-security stable";
+ "silent-map stable-kfreebsd-security stable-kfreebsd";
  "silent-map oldstable-security oldstable";
-  "silent-map etch-secure oldstable";
+ "silent-map oldoldstable-security oldoldstable";
   "silent-map testing-security testing";
-  "silent-map squeeze-security oldstable";
-  "silent-map wheezy-security stable";
-  "silent-map jessie-security testing";
+  "silent-map squeeze-security oldoldstable";
+  "silent-map wheezy-security oldstable";
+  "silent-map jessie-security stable";
+  "silent-map jessie-kfreebsd-security stable-kfreebsd";
+  "silent-map stretch-security testing";
+
+  "reject oldoldstable";
 };
 
 Dir
@@ -149,7 +154,6 @@ Dir
   Override "/srv/security-master.debian.org/scripts/override/";
   Upload "/srv/queued/ftpmaster/";
   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/";