merge from master

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 9bc64d52aadd23bec57da5a0bc556aba67fd6e34..e5a82864f49a4fe6203a5e32f83310192638d603 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,13 +1,16 @@
 Dinstall
 {
    GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
-      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
+      "/usr/share/keyrings/debian-keyring.gpg";
+      "/usr/share/keyrings/debian-keyring.pgp";
+      "/usr/share/keyrings/debian-keyring.pgp";
+//      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+   SendmailCommand "/bin/echo -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -23,8 +26,8 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
+   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
    {
      unstable;
@@ -32,32 +35,21 @@ Dinstall
    Reject
    {
      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";
 };
 
-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;
-   };   
-  };
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
 };
 
 Generate-Index-Diffs
@@ -88,6 +80,17 @@ Mirror-Split
   };
 };
 
+Show-New
+{
+  HTMLPath "/srv/ftp.debian.org/web/new/";
+}
+
+Show-Deferred
+{
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  DeferredQueue "/srv/queued/DEFERRED/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -133,10 +136,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 "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r1/";
+   StableRejector "the Stable Release Team";
+   StableMail "debian-release@lists.debian.org";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
 };
 
 Import-LDAP-Fingerprints
@@ -189,7 +201,7 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
+  OldStable
   {
        Components
        {
@@ -202,11 +214,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -214,17 +226,18 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r6";
+       // Version "4.0r1";
        Origin "Debian";
-       Description "Debian 3.1r6 Released 7 April 2007";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
-       Priority "2";
+       // Description "Debian 4.0r1 Released 15 August 2007";
+       CodeName "etch";
+       OverrideCodeName "etch";
+       Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
+       ChangeLogBase "dists/oldstable/";
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -241,11 +254,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -256,18 +269,19 @@ Suite
        CopyChanges "dists/oldstable-proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
        CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
-       Version "3.1-updates";
+       Version "4.0-updates";
        Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "sarge-proposed-updates";
-       OverrideCodeName "sarge";
+       Description "Debian 4.0 Proposed Updates - Not Released";
+       CodeName "etch-proposed-updates";
+       OverrideCodeName "etch";
        OverrideSuite "oldstable";
-       Priority "2";
+       ValidTime 604800; // 7 days
+       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
          {
-           Oldstable;
+           OldStable;
          };
          MustBeOlderThan
          {
@@ -278,7 +292,7 @@ Suite
          };
          Enhances
           {
-           Oldstable;
+           OldStable;
          };
        };
        UdebComponents
@@ -302,6 +316,7 @@ Suite
          alpha;
          amd64;
          arm;
+         armel;
          hppa;
          i386;
          ia64;
@@ -312,14 +327,14 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "4.0r1";
+       // Version "5.0r0";
        Origin "Debian";
-       Description "Debian 4.0r1 Released 15 August 2007";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       // Description "Debian 5.0r0 Released 14 February 2009";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        Priority "5";
        Untouchable "1";
-        ChangeLogBase "dists/stable/";
+       ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
@@ -342,6 +357,7 @@ Suite
          alpha;
          amd64;
          arm;
+          armel;
          hppa;
          i386;
          ia64;
@@ -355,12 +371,13 @@ Suite
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
-       Version "4.0-updates";
+       Version "5.0-updates";
        Origin "Debian";
-       Description "Debian 4.0 Proposed Updates - Not Released";
-       CodeName "etch-proposed-updates";
-       OverrideCodeName "etch";
+       Description "Debian 5.0 Proposed Updates - Not Released";
+       CodeName "lenny-proposed-updates";
+       OverrideCodeName "lenny";
        OverrideSuite "stable";
+       ValidTime 604800; // 7 days
        Priority "4";
        VersionChecks
        {
@@ -382,6 +399,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -399,7 +417,7 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
+         armel;
          hppa;
          i386;
          ia64;
@@ -412,8 +430,9 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "lenny";
-       OverrideCodeName "lenny";
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
+       ValidTime 604800; // 7 days
        Priority "5";
        UdebComponents
        {
@@ -436,11 +455,10 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
+         armel;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -450,9 +468,10 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "testing-proposed-updates";
-       OverrideCodeName "lenny";
+       CodeName "squeeze-proposed-updates";
+       OverrideCodeName "squeeze";
        OverrideSuite "testing";
+       ValidTime 604800; // 7 days
        Priority "6";
        VersionChecks
        {
@@ -506,7 +525,6 @@ Suite
        };
   };
 
-
   Unstable
   {
        Components
@@ -521,12 +539,11 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
+         armel;
          hppa;
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -538,6 +555,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
+       ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
        {
@@ -570,12 +588,11 @@ Suite
          all;
          alpha;
          amd64;
-         arm;
+         armel;
          hppa;
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -589,6 +606,7 @@ Suite
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";
+       ValidTime 604800; // 7 days
        Priority "0";
        VersionChecks
        {
@@ -619,6 +637,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";
@@ -628,6 +647,36 @@ SuiteMappings
  "map-unreleased testing-proposed-updates unstable";
 };
 
+AutomaticByHandPackages {
+  "debian-installer-images" {
+    Source "debian-installer";
+    Section "raw-installer";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
+  };
+
+  "debian-maintainers" {
+    Source "debian-maintainers";
+    Section "raw-keyring";
+    Extension "gpg";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm";
+  };
+
+  "tag-overrides" {
+    Source "tag-overrides";
+    Section "byhand";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
+  };
+
+  "task-overrides" {
+    Source "tasksel";
+    Section "byhand";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task";
+  };
+};
+
 Dir
 {
   Root "/srv/ftp.debian.org/ftp/";
@@ -641,7 +690,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/";
@@ -657,6 +706,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";
@@ -800,3 +857,8 @@ Urgency
     critical;
   };
 };
+
+Content
+{
+  Header "contents"
+}
\ No newline at end of file