Merge

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 182e28af871143eb559459a82919c8513924b2f5..97fb62107f253dbbf435495dbce87856c4b6e1b3 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -34,10 +34,15 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
-     ReleaseTransitions "/srv/ftp.debian.org/testing/hints/transitions.yaml";
+     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
 };
 
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};
+
 Binary-Upload-Restrictions
 {
  Components
@@ -631,6 +636,7 @@ SuiteMappings
  "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
+ "map stable-proposed-updates proposed-updates";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -676,7 +682,7 @@ Dir
   MorgueReject "reject";
   Override "/srv/ftp.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
-  UrgencyLog "/srv/ftp.debian.org/testing/urgencies/";
+  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   Queue
   {
     Accepted "/srv/ftp.debian.org/queue/accepted/";