X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=1d9b1e6530101dbbc9b10bcbd79e20ccb8b41a39;hb=89e12ff173b59ba73d6ab64d312e78de2b9d812e;hp=dfd12bf96234d74c11d4c6fb3b23ac25ca5b9365;hpb=6cfd1b05a05c82cac6cabb4af511093b37e903dd;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index dfd12bf9..1d9b1e65 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
-   MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -150,7 +150,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
 	Components 
 	{
@@ -169,7 +169,7 @@ Suite
 	CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
 	Components
 	{
@@ -181,12 +181,31 @@ Suite
 	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian testing Security Updates";
+	Description "Debian 6.0 Security Updates";
 	ValidTime 864000; // 10 days
 	CodeName "squeeze";
 	OverrideCodeName "squeeze";
 	CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
+
+  Testing
+  {
+	Components
+	{
+	  updates/main;
+	  updates/contrib;
+	  updates/non-free;
+	};
+	Announce "dak@security.debian.org";
+	Version "";
+	Origin "Debian";
+	Label "Debian-Security";
+	Description "Debian testing Security Updates";
+	ValidTime 864000; // 10 days
+	CodeName "wheezy";
+	OverrideCodeName "wheezy";
+	CopyDotDak "/srv/security-master.debian.org/queue/done/";
+  };
 };
 
 SuiteMappings
@@ -198,12 +217,16 @@ SuiteMappings
   "silent-map etch-secure oldstable";
   "silent-map lenny-secure stable";
   "silent-map testing-security testing";
+  "silent-map lenny-security oldstable";
+  "silent-map squeeze-security stable";
+  "silent-map wheezy-security testing";
 };
 
 Dir
 {
   Root "/srv/security-master.debian.org/ftp/";
   Pool "/srv/security-master.debian.org/ftp/pool/";
+  Export "/srv/security-master.debian.org/export/";
   Dak "/srv/security-master.debian.org/dak/";
   Templates "/srv/security-master.debian.org/dak/templates/";
   PoolRoot "pool/";
@@ -217,6 +240,7 @@ Dir
   Override "/srv/security-master.debian.org/scripts/override/";
   QueueBuild "/srv/security-master.debian.org/buildd/";
   Upload "/srv/queued/ftpmaster/";
+  TempPath "/srv/security-master.debian.org/tmp";
   Queue
   {
     Byhand "/srv/security-master.debian.org/queue/byhand/";
@@ -227,8 +251,8 @@ Dir
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
     Newstage "/srv/security-master.debian.org/queue/newstage/";
 
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
+    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
 
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";
@@ -411,3 +435,8 @@ Urgency
     critical;
   };
 };
+
+Changelogs
+{
+  Export "/srv/security-master.debian.org/export/changelogs";
+}