X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fdak.conf;h=00f0bd1ab294f52450fc08bf7ea926180706ccd5;hb=a4baee479f3b5d5351d9f873f1bbf8a62028d044;hp=c5a87ca1c885bd800ad3e79f13a314505a0aa709;hpb=8ecb9ff76c84bb82f9289b03ce79aaa939ea2d82;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index c5a87ca1..00f0bd1a 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -24,7 +24,6 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
@@ -36,6 +35,14 @@ Dinstall
      NoSourceOnly "true";
      ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
+   // 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
+   // the real maintainers of a package you upload with mail.
+   // format of entries: one entry per line. Either an email address directly, or a regular expression,
+   // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will
+   // only allow to mail jane.doe@domain.com while the second will mail all of jane*@domain.com
+   //  MailWhiteList "/some/path/to/a/file";
 };
 
 Transitions
@@ -43,56 +50,6 @@ Transitions
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
 Generate-Index-Diffs
 {
    Options
@@ -177,11 +134,19 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
 };
 
 Import-LDAP-Fingerprints
@@ -400,7 +365,7 @@ Suite
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
-	CodeName "testing-proposed-updates";
+	CodeName "lenny-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
@@ -640,6 +605,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";