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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 8c5c1fb5..a7e34cba 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -19,6 +19,7 @@ Dinstall
    DefaultSuite "unstable";
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
+   AllowSourceOnlyUploads true;
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
    // to set the following option to a real path/filename and then enter those mail addresses that
    // you want to be able to receive mails generated by your dak installation. This avoids spamming
@@ -58,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";
 };
@@ -98,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";
@@ -120,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";
@@ -143,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";
@@ -151,9 +163,11 @@ SuiteMappings
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
 
- "reject oldstable-proposed-updates";
- "reject jessie-backports";
+ "reject oldoldstable-proposed-updates";
+ "reject stable-kfreebsd";
+ "reject wheezy-updates";
  "reject jessie-updates";
+ "reject stretch-updates";
 };
 
 AutomaticByHandPackages {
@@ -204,10 +218,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 +269,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 "";