X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=d5858da3a86af34090349e956dd08d35bd714b94;hp=d620a861d11023e10656cca4a12e40e52f7bd4f5;hb=356f4f93a9d0b29c0878111f7c3eee194f6571e5;hpb=a2d567e54f8bb92d85e69604a0807d8d1476c109

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index d620a861..d5858da3 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -59,7 +59,7 @@ Show-Deferred
 
 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,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup";
 };
@@ -99,7 +99,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";
@@ -121,22 +121,31 @@ Process-New
 
 SuiteMappings
 {
- "silent-map squeeze-security oldstable-security";
- "silent-map wheezy-security stable-security";
- "silent-map jessie-security testing-security";
+ "silent-map squeeze-security oldoldstable-security";
+ "silent-map wheezy-security oldstable-security";
+ "silent-map jessie-security stable-security";
+ "silent-map jessie-kfreebsd-security stable-kfreebsd-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map squeeze oldstable";
- "map squeeze-proposed-updates oldstable-proposed-updates";
- "map squeeze-updates oldstable-proposed-updates";
- "map wheezy stable";
- "map wheezy-proposed-updates proposed-updates";
- "map wheezy-updates proposed-updates";
- "map jessie testing";
- "map jessie-proposed-updates testing-proposed-updates";
- "map jessie-updates testing-proposed-updates";
+ "map squeeze oldoldstable";
+ "map squeeze-proposed-updates oldoldstable-proposed-updates";
+ "map squeeze-updates oldoldstable-proposed-updates";
+ "map wheezy oldstable";
+ "map wheezy-proposed-updates oldstable-proposed-updates";
+ "map wheezy-updates oldstable-proposed-updates";
+ "map jessie stable";
+ "map jessie-proposed-updates proposed-updates";
+ "map jessie-updates proposed-updates";
+ "map jessie-kfreebsd stable-kfreebsd";
+ "map jessie-kfreebsd-proposed-updates stable-kfreebsd-proposed-updates";
+ "map stretch testing";
+ "map stretch-proposed-updates testing-proposed-updates";
+ "map stretch-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
+ "map oldoldstable oldoldstable-proposed-updates";
+ "map oldoldstable-security oldoldstable-proposed-updates";
+ "map oldoldstable-updates oldoldstable-proposed-updates";
  "map oldstable oldstable-proposed-updates";
  "map oldstable-security oldstable-proposed-updates";
  "map oldstable-updates oldstable-proposed-updates";
@@ -144,6 +153,8 @@ SuiteMappings
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
  "map stable-updates proposed-updates";
+ "map stable-kfreebsd stable-kfreebsd-proposed-updates";
+ "map stable-kfreebsd-security stable-kfreebsd-proposed-updates";
  "map testing-updates testing-proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -152,8 +163,11 @@ SuiteMappings
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
 
- "reject oldstable-proposed-updates";
+ "reject oldoldstable-proposed-updates";
+ "reject stable-kfreebsd";
+ "reject wheezy-updates";
  "reject jessie-updates";
+ "reject stretch-updates";
 };
 
 AutomaticByHandPackages {
@@ -171,6 +185,13 @@ AutomaticByHandPackages {
     Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di";
   };
 
+  "linux-code-sign" {
+    Source "linux";
+    Section "byhand";
+    Extension "tar.xz";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-code-sign";
+  };
+
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";
@@ -204,10 +225,9 @@ Dir
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
   Override "/srv/ftp-master.debian.org/scripts/override/";
-  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  UrgencyLog "/srv/ftp.debian.org/web/britney/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
   BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-  Holding "/srv/ftp-master.debian.org/queue/holding/";
   Done "/srv/ftp-master.debian.org/queue/done/";
   Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
@@ -256,13 +276,6 @@ Common
   ThreadCount 16;
 }
 
-Changelogs
-{
-  Testing "/srv/release.debian.org/tools/trille/current-testing";
-  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
-  Export "/srv/ftp-master.debian.org/export/changelogs";
-}
-
 ByGroup {
   dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
   ftpteam "";