debian-security/dak.conf: Remove references to non-US

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 363d8c79196eaa17b2be9634ef122a7297bb58a7..7877ed9df3b580791ad40b1fdc28b8961665cd3f 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -36,9 +36,9 @@ 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";
+  KnownPostgres "postgres,dak,www-data,udmsearch,repuser,debian-backup";
 };
 
 Queue-Report
@@ -56,7 +56,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/ca-debian/ca-certificates.crt";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -105,10 +105,7 @@ Rm
 
 Clean-Suites
 {
-  // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "pool";
-  OverrideFilename "override.source-only";
 };
 
 Security-Install
@@ -118,21 +115,23 @@ Security-Install
     main "ftp-master.debian.org:/pub/UploadQueue";
     contrib "ftp-master.debian.org:/pub/UploadQueue";
     non-free "ftp-master.debian.org:/pub/UploadQueue";
-    non-US/main "non-us.debian.org:/pub/UploadQueue";
-    non-US/contrib "non-us.debian.org:/pub/UploadQueue";
-    non-US/non-free "non-us.debian.org:/pub/UploadQueue";
   };
 };
 
 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
@@ -152,7 +151,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/";
 
@@ -180,9 +178,6 @@ ComponentMappings
  "main updates/main";
  "contrib updates/contrib";
  "non-free updates/non-free";
- "non-US/main updates/main";
- "non-US/contrib updates/contrib";
- "non-US/non-free updates/non-free";
 };
 
 Urgency
@@ -197,3 +192,8 @@ Urgency
     critical;
   };
 };
+
+Changelogs
+{
+  Export "/srv/security-master.debian.org/export/changelogs";
+};