X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=c4a932a0cd1ac23255f5e18756c925e7ae0ad53f;hp=87f444ab866898b775c9d80862b8ca72cea3b9f5;hb=356f4f93a9d0b29c0878111f7c3eee194f6571e5;hpb=833e9aa556311f8fca3615c5d46c832d3ed990a7

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 87f444ab..c4a932a0 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";
@@ -108,30 +108,30 @@ Clean-Suites
   MorgueSubDir "pool";
 };
 
-Security-Install
-{
-  ComponentMappings
-  {
-    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 oldstable";
+  "reject oldoldstable";
+};
+
+AutomaticByHandPackages
+{
+  "linux-code-sign" {
+    Source "linux";
+    Section "byhand";
+    Extension "tar.xz";
+    Script "/srv/security-master.debian.org/dak/scripts/debian/byhand-code-sign";
+  };
 };
 
 Dir
@@ -151,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/";
 
@@ -179,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