X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=a14cd80beb1791c76f18e314367b699fc50b9ae4;hb=a30c5f2a4e31e61d7537d44c7b5dbcd7531e3898;hp=85ff4a39aa5f7da45a416d2a27f16b28ca713978;hpb=1dd3d2fb2df2af57cf3966e257a94e000235407a;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 85ff4a39..a14cd80b 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -5,7 +5,7 @@ Dinstall
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
-   MyAdminAddress "ftpmaster@debian.org";
+   MyAdminAddress "ftpmaster@ftp-master.debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
@@ -217,18 +217,25 @@ Suite
 
 SuiteMappings
 {
- "silent-map squeeze-security stable-security";
- "silent-map wheezy-security testing-security";
+ "silent-map squeeze-security oldstable-security";
+ "silent-map wheezy-security stable-security";
+ "silent-map jessie-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map squeeze stable";
- "map squeeze-proposed-updates proposed-updates";
- "map squeeze-updates proposed-updates";
- "map wheezy testing";
- "map wheezy-proposed-updates testing-proposed-updates";
- "map wheezy-updates testing-proposed-updates";
+ "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 sid unstable";
  "map rc-buggy experimental";
+ "map oldstable oldstable-proposed-updates";
+ "map oldstable-security oldstable-proposed-updates";
+ "map oldstable-updates oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
@@ -277,7 +284,6 @@ Dir
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
-  Export "/srv/ftp-master.debian.org/export/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";