]> git.decadent.org.uk Git - dak.git/blobdiff - config/debian/dak.conf
path changes
[dak.git] / config / debian / dak.conf
index 63764997cd3f96dff17e36868380b9790f3ccec1..c0a902c400ba29b24d67e139b762390807471561 100644 (file)
@@ -3,20 +3,21 @@ Dinstall
    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";
+      "/srv/keyring.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>";
+   SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+   SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
+   SigningKeyIds "55BE302B";
+//   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 "Archive Administrator <installer@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
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
+   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
@@ -25,7 +26,7 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
-   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
+   LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    QueueBuildSuites
    {
      unstable;
@@ -33,7 +34,7 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
-     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
+     ReleaseTransitions "/srv/ftp-master.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
@@ -47,14 +48,14 @@ Dinstall
 
 Transitions
 {
-   TempPath "/srv/ftp.debian.org/tmp/";
+   Notifications "debian-devel@lists.debian.org";
 };
 
 Generate-Index-Diffs
 {
    Options
    {
-     TempDir "/srv/ftp.debian.org/tiffani";
+     TempDir "/srv/ftp-master.debian.org/tiffani";
      MaxDiffs { Default 14; };
    };
 };
@@ -66,9 +67,9 @@ Override
 
 Mirror-Split
 {
-  FTPPath "/srv/ftp.debian.org/ftp";
-  TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs";
+  FTPPath "/srv/ftp-master.debian.org/ftp";
+  TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
   BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
   CombinationTrees
   {
@@ -80,12 +81,12 @@ Mirror-Split
 
 Show-New
 {
-  HTMLPath "/srv/ftp.debian.org/web/new/";
+  HTMLPath "/srv/ftp-master.debian.org/web/new/";
 }
 
 Show-Deferred
 {
-  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  LinkPath "/srv/ftp-master.debian.org/web/deferred/";
   DeferredQueue "/srv/queued/DEFERRED/";
 }
 
@@ -93,7 +94,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
 };
 
 Clean-Queues
@@ -125,18 +126,18 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/srv/ftp.debian.org/web/removals.txt";
+   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
    Bcc "removed-packages@qa.debian.org";
 };
 
 Import-Archive
 {
-  ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
+  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
 };
 
 Import-Keyring
 {
-  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
     {
       Debian-Maintainer "true";
     };
@@ -172,7 +173,8 @@ Clean-Suites
 
 Process-New
 {
-  AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
+  LockDir "/srv/ftp-master.debian.org/lock/new/";
 };
 
 Check-Overrides
@@ -199,106 +201,6 @@ Check-Overrides
 
 Suite
 {
-  OldStable
-  {
-       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/oldstable/";
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
-  };
-
-  Oldstable-Proposed-Updates
-  {
-       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";
-       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 "4.0-updates";
-       Origin "Debian";
-       Description "Debian 4.0 Proposed Updates - Not Released";
-       CodeName "etch-proposed-updates";
-       OverrideCodeName "etch";
-       OverrideSuite "oldstable";
-       ValidTime 604800; // 7 days
-       Priority "4";
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-         };
-         MustBeOlderThan
-         {
-           Stable;
-           Testing;
-           Unstable;
-           Experimental;
-         };
-         Enhances
-          {
-           OldStable;
-         };
-       };
-       UdebComponents
-       {
-         main;
-       };
-  };
-
   Stable
   {
        Components
@@ -307,23 +209,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        // Version "5.0r0";
        Origin "Debian";
@@ -331,7 +216,6 @@ Suite
        CodeName "lenny";
        OverrideCodeName "lenny";
        Priority "5";
-       Untouchable "1";
        ChangeLogBase "dists/stable/";
        UdebComponents
        {
@@ -348,27 +232,10 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         arm;
-          armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
-       CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
+       CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
+       CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
        Version "5.0-updates";
        Origin "Debian";
        Description "Debian 5.0 Proposed Updates - Not Released";
@@ -381,14 +248,15 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
          };
-         MustBeOlderThan
-         {
-           Testing;
-           Unstable;
-           Experimental;
-         };
+//       MustBeOlderThan
+//       {
+//         Testing;
+//         Unstable;
+//         Experimental;
+//       };
          Enhances
           {
            Stable;
@@ -409,22 +277,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
@@ -447,22 +299,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
@@ -475,8 +311,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
          };
          MustBeOlderThan
@@ -496,33 +333,6 @@ Suite
        };
   };
 
-  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
@@ -531,23 +341,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         hurd-i386;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Unstable - Not Released";
@@ -559,8 +352,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
          };
@@ -580,23 +374,6 @@ Suite
          contrib;
          non-free;
        };
-       Architectures
-       {
-         source;
-         all;
-         alpha;
-         amd64;
-         armel;
-         hppa;
-         hurd-i386;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Experimental packages - not released; use at your own risk.";
@@ -610,8 +387,9 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
            Unstable;
@@ -628,15 +406,19 @@ Suite
 
 SuiteMappings
 {
- "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+// "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 lenny stable";
+ "map squeeze testing";
+ "map sid unstable";
+ "map rc-buggy experimental";
+// "map oldstable oldstable-proposed-updates";
+// "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 oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -650,57 +432,54 @@ AutomaticByHandPackages {
     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";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di";
   };
 
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";
     Extension "tar.gz";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
+    Script "/srv/ftp-master.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";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
   };
 };
 
 Dir
 {
-  Root "/srv/ftp.debian.org/ftp/";
-  Pool "/srv/ftp.debian.org/ftp/pool/";
-  Templates "/srv/ftp.debian.org/dak/templates/";
+  Root "/srv/ftp-master.debian.org/ftp/";
+  Pool "/srv/ftp-master.debian.org/ftp/pool/";
+  Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
-  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/";
+  Lists "/srv/ftp-master.debian.org/database/dists/";
+  Log "/srv/ftp-master.debian.org/log/";
+  Lock "/srv/ftp-master.debian.org/lock";
+  Morgue "/srv/ftp-master.debian.org/morgue/";
   MorgueReject "reject";
-  Override "/srv/ftp.debian.org/scripts/override/";
+  Override "/srv/ftp-master.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  TempPath "/srv/ftp-master.debian.org/tmp/";
   Queue
   {
-    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/";
+    Byhand "/srv/ftp-master.debian.org/queue/byhand/";
+    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
+    OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
+    Done "/srv/ftp-master.debian.org/queue/done/";
+    Holding "/srv/ftp-master.debian.org/queue/holding/";
+    New "/srv/ftp-master.debian.org/queue/new/";
+    Reject "/srv/ftp-master.debian.org/queue/reject/";
+    Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
+    Newstage "/srv/ftp-master.debian.org/queue/newstage/";
+    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+    Embargoed "/does/not/exist/";
+    Unembargoed "/does/not/exist/";
+    Disembargo "/does/not/exist/";
   };
 };
 
@@ -708,7 +487,7 @@ Queue-Report
 {
   ReportLocations
   {
-    822Location "/srv/ftp.debian.org/web/new.822";
+    822Location "/srv/ftp-master.debian.org/web/new.822";
   };
 };
 
@@ -728,6 +507,7 @@ Architectures
   hppa "HP PA RISC";
   amd64 "AMD64";
   arm "ARM";
+  armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
@@ -735,8 +515,9 @@ Architectures
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
   s390 "IBM S/390";
-  sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
+  kfreebsd-i386 "GNU/kFreeBSD i386";
+  kfreebsd-amd64 "GNU/kFreeBSD amd64";
 };
 
 Archive
@@ -768,42 +549,50 @@ Component
        Description "Software that fails to meet the DFSG";
        MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-       Description "Legacy Mixed";
-       MeetsDFSG "false";
-  };
 };
 
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
   embedded;
   electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -811,7 +600,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
+  xfce;
+  zope;
 };
 
 Priority
@@ -835,7 +628,7 @@ Location
 {
 
   // Pool locations on ftp-master.debian.org
-  /srv/ftp.debian.org/ftp/pool/
+  /srv/ftp-master.debian.org/ftp/pool/
     {
       Archive "ftp-master";
       Type "pool";
@@ -859,4 +652,5 @@ Urgency
 Contents
 {
   Header "contents";
-}
\ No newline at end of file
+  Root "/srv/ftp-master.debian.org/test/";
+}