]> git.decadent.org.uk Git - dak.git/blobdiff - config/debian/dak.conf
[??] sync with ftp-master/dak master
[dak.git] / config / debian / dak.conf
index 89b839c4744ffbe2264f3cca3ef222d84e6573b2..daf7a50e0ddba9c06250ebce2d59b6c0614604a8 100644 (file)
@@ -1,10 +1,13 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-   SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "4F368D5D";
+   GPGKeyring {
+      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/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";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -13,9 +16,8 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/ftp.debian.org/lock/dinstall.lock";
+   LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
-   GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -24,6 +26,7 @@ Dinstall
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
    DefaultSuite "unstable";
+   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
    {
      unstable;
@@ -34,25 +37,50 @@ Dinstall
    };
 };
 
-Tiffani
+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
    {
-     TempDir "/org/ftp.debian.org/tiffani";
-     MaxDiffs { Default 90; };
+     TempDir "/srv/ftp.debian.org/tiffani";
+     MaxDiffs { Default 14; };
    };
 };
 
-Alicia
+Override
 {
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
-Billie
+Mirror-Split
 {
-  FTPPath "/org/ftp.debian.org/ftp";
-  TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs";
+  FTPPath "/srv/ftp.debian.org/ftp";
+  TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs";
   BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
   CombinationTrees
   {
@@ -62,23 +90,28 @@ Billie
   };
 };
 
-Julia
+Show-New
+{
+  HTMLPath "/srv/ftp.debian.org/web/new/";
+}
+
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie";
+  KnownPostgres "postgres,dak,katie,release";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queues";
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -90,7 +123,7 @@ Natalie
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -98,48 +131,48 @@ Melanie
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/ftp.debian.org/web/removals.txt";
+   LogFile "/srv/ftp.debian.org/web/removals.txt";
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/ftp.debian.org/katie/neve-files/";
+  ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
-Lauren
+Reject-Proposed-Updates
 {
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.1r2/";
+   StableRejector "Andreas Barth and Martin Zobel-Helas";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/";
 };
 
-Emilie
+Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
   ExtraKeyrings
   {
-    "/org/keyring.debian.org/keyrings/removed-keys.pgp";
-    "/org/keyring.debian.org/keyrings/removed-keys.gpg";
-    "/org/keyring.debian.org/keyrings/extra-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
   };
   KeyServer "wwwkeys.eu.pgp.net";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   QueueBuildStayOfExecution 86400; // 24 hours
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
-Lisa
+Process-New
 {
-  AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
+  AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
 };
 
-Cindy
+Check-Overrides
 {
   OverrideSuites
   {
@@ -188,16 +221,21 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0r6";
+       Version "3.1r6";
        Origin "Debian";
-       Description "Debian 3.0r6 Released 31 May 2005";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       Priority "1";
+       Description "Debian 3.1r6 Released 7 April 2007";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       Priority "2";
        Untouchable "1";
+        ChangeLogBase "dists/oldstable/";
+       UdebComponents
+       {
+         main;
+       };
   };
 
-  Stable
+  Oldstable-Proposed-Updates
   {
        Components
        {
@@ -222,17 +260,77 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.1r1";
+       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";
        Origin "Debian";
-       Description "Debian 3.1r1 Released 17 December 2005";
-       CodeName "sarge";
+       Description "Debian 3.1 Proposed Updates - Not Released";
+       CodeName "sarge-proposed-updates";
        OverrideCodeName "sarge";
-       Priority "3";
+       OverrideSuite "oldstable";
+       Priority "2";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Oldstable;
+         };
+         MustBeOlderThan
+         {
+           Stable;
+           Testing;
+           Unstable;
+           Experimental;
+         };
+         Enhances
+          {
+           Oldstable;
+         };
+       };
+       UdebComponents
+       {
+         main;
+       };
+  };
+
+  Stable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         alpha;
+         amd64;
+         arm;
+         hppa;
+         i386;
+         ia64;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       // Version "4.0r1";
+       Origin "Debian";
+       // Description "Debian 4.0r1 Released 15 August 2007";
+       CodeName "etch";
+       OverrideCodeName "etch";
+       Priority "5";
        Untouchable "1";
-       ChangeLogBase "dists/stable/";
+        ChangeLogBase "dists/stable/";
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -249,11 +347,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -262,12 +360,13 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
-       Version "3.1-updates";
+       CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
+       CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
+       Version "4.0-updates";
        Origin "Debian";
-       Description "Debian 3.1 Proposed Updates - Not Released";
-       CodeName "proposed-updates";
-       OverrideCodeName "sarge";
+       Description "Debian 4.0 Proposed Updates - Not Released";
+       CodeName "etch-proposed-updates";
+       OverrideCodeName "etch";
        OverrideSuite "stable";
        Priority "4";
        VersionChecks
@@ -306,11 +405,11 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -320,12 +419,13 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        Priority "5";
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -342,6 +442,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          i386;
@@ -357,7 +458,7 @@ Suite
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
        CodeName "testing-proposed-updates";
-       OverrideCodeName "etch";
+       OverrideCodeName "lenny";
        OverrideSuite "testing";
        Priority "6";
        VersionChecks
@@ -381,9 +482,38 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
+  Etch-m68k
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         m68k;
+       };
+       Announce "debian-testing-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Debian Etch for m68k - Not Released";
+       CodeName "etch-m68k";
+       OverrideCodeName "etch";
+       Priority "5";
+       UdebComponents
+       {
+         main;
+         non-free;
+       };
+  };
+
+
   Unstable
   {
        Components
@@ -397,6 +527,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          hurd-i386;
@@ -407,7 +538,6 @@ Suite
          mipsel;
          powerpc;
          s390;
-         sh;
          sparc;
        };
        Announce "debian-devel-changes@lists.debian.org";
@@ -429,6 +559,7 @@ Suite
        UdebComponents
        {
          main;
+         non-free;
        };
   };
 
@@ -445,6 +576,7 @@ Suite
          source;
          all;
          alpha;
+         amd64;
          arm;
          hppa;
          hurd-i386;
@@ -455,7 +587,6 @@ Suite
          mipsel;
          powerpc;
          s390;
-         sh;
          sparc;
        };
        Announce "debian-devel-changes@lists.debian.org";
@@ -466,7 +597,6 @@ Suite
        OverrideCodeName "sid";
        OverrideSuite "unstable";
        Priority "0";
-        Tree "project/experimental";
        VersionChecks
        {
          MustBeNewerThan
@@ -478,17 +608,25 @@ Suite
            Unstable;
          };
        };
-
+       UdebComponents
+       {
+         main;
+         non-free;
+       };
   };
 
 };
 
 SuiteMappings
 {
+ "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
+ "map oldstable oldstable-proposed-updates";
+ "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
+ "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -497,30 +635,55 @@ SuiteMappings
  "map-unreleased testing-proposed-updates unstable";
 };
 
+AutomaticByHandPackages {
+  "debian-installer-images" {
+    Source "xxx-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";
+  };
+};
+
 Dir
 {
-  Root "/org/ftp.debian.org/ftp/";
-  Pool "/org/ftp.debian.org/ftp/pool/";
-  Templates "/org/ftp.debian.org/katie/templates/";
+  Root "/srv/ftp.debian.org/ftp/";
+  Pool "/srv/ftp.debian.org/ftp/pool/";
+  Templates "/srv/ftp.debian.org/dak/templates/";
   PoolRoot "pool/";
-  Lists "/org/ftp.debian.org/database/dists/";
-  Log "/org/ftp.debian.org/log/";
-  Lock "/org/ftp.debian.org/lock";
-  Morgue "/org/ftp.debian.org/morgue/";
+  Lists "/srv/ftp.debian.org/database/dists/";
+  Log "/srv/ftp.debian.org/log/";
+  Lock "/srv/ftp.debian.org/lock";
+  Morgue "/srv/ftp.debian.org/morgue/";
   MorgueReject "reject";
-  Override "/org/ftp.debian.org/scripts/override/";
-  QueueBuild "/org/incoming.debian.org/buildd/";
-  UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
+  Override "/srv/ftp.debian.org/scripts/override/";
+  QueueBuild "/srv/incoming.debian.org/buildd/";
+  UrgencyLog "/srv/ftp.debian.org/testing/urgencies/";
   Queue
   {
-    Accepted "/org/ftp.debian.org/queue/accepted/";
-    Byhand "/org/ftp.debian.org/queue/byhand/";
-    Done "/org/ftp.debian.org/queue/done/";
-    Holding "/org/ftp.debian.org/queue/holding/";
-    New "/org/ftp.debian.org/queue/new/";
-    Reject "/org/ftp.debian.org/queue/reject/";
-    Unchecked "/org/ftp.debian.org/queue/unchecked/";
-    BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/";
+    Accepted "/srv/ftp.debian.org/queue/accepted/";
+    Byhand "/srv/ftp.debian.org/queue/byhand/";
+    ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
+    OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";
+    Done "/srv/ftp.debian.org/queue/done/";
+    Holding "/srv/ftp.debian.org/queue/holding/";
+    New "/srv/ftp.debian.org/queue/new/";
+    Reject "/srv/ftp.debian.org/queue/reject/";
+    Unchecked "/srv/ftp.debian.org/queue/unchecked/";
+    BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
   };
 };
 
@@ -529,12 +692,6 @@ DB
   Name "projectb";
   Host "";
   Port -1;
-
-  NonUSName "projectb";
-  NonUSHost "non-US.debian.org";
-  NonUSPort -1;
-  NonUSUser "auric";
-  NonUSPassword "moo";
 };
 
 Architectures
@@ -544,6 +701,7 @@ Architectures
   alpha "DEC Alpha";
   hurd-i386 "Intel ia32 running the HURD";
   hppa "HP PA RISC";
+  amd64 "AMD64";
   arm "ARM";
   i386 "Intel ia32";
   ia64 "Intel ia64";
@@ -652,7 +810,7 @@ Location
 {
 
   // Pool locations on ftp-master.debian.org
-  /org/ftp.debian.org/ftp/pool/
+  /srv/ftp.debian.org/ftp/pool/
     {
       Archive "ftp-master";
       Type "pool";