Remove references to changelog exportpath, no longer used

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6b5e17a9db52dc157b4f063d76b55333775e3099..fc0ec404969de84bcd9788a54f3ae2609a953dc6 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
@@ -21,10 +20,7 @@ Dinstall
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
-   Reject
-   {
-     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
-   };
+   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
@@ -45,13 +41,14 @@ Generate-Index-Diffs
    Options
    {
      TempDir "/srv/ftp-master.debian.org/tiffani";
-     MaxDiffs { Default 14; };
+     MaxDiffs { Default 56; };
    };
 };
 
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
+  Options::Queue "new,backports-new";
 }
 
 Show-Deferred
@@ -64,7 +61,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,qa,www-data,guest,repuser";
+  KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -98,19 +95,6 @@ Rm
    Bcc "removed-packages@qa.debian.org";
 };
 
-Import-Archive
-{
-  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
-};
-
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -133,7 +117,6 @@ Clean-Suites
 
 Process-New
 {
-  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
   LockDir "/srv/ftp-master.debian.org/lock/new/";
 };
 
@@ -161,34 +144,14 @@ Check-Overrides
 
 Suite
 {
-  OldStable
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-  };
-
   Stable
   {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-  };
-
-  OldStable-Proposed-Updates
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
   };
 
   Proposed-Updates
@@ -254,28 +217,23 @@ Suite
 
 SuiteMappings
 {
- "silent-map lenny-security oldstable-security";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
- "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 lenny oldstable";
- "map lenny-proposed-updates oldstable-proposed-updates";
  "map squeeze stable";
  "map squeeze-proposed-updates proposed-updates";
  "map squeeze-updates proposed-updates";
  "map wheezy testing";
  "map wheezy-proposed-updates testing-proposed-updates";
+ "map wheezy-updates testing-proposed-updates";
  "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 stable-updates proposed-updates";
- "map-unreleased oldstable unstable";
+ "map testing-updates testing-proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -315,11 +273,10 @@ AutomaticByHandPackages {
 
 Dir
 {
+  Base "/srv/ftp-master.debian.org/";
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
-  Export "/srv/ftp-master.debian.org/export/";
-  PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
@@ -328,23 +285,10 @@ Dir
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
-  Queue
-  {
-    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/";
-    ProposedUpdates "/srv/ftp-master.debian.org/queue/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 "/srv/ftp-master.debian.org/does/not/exist/";
-    Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
-    Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
-  };
+  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/ftp-master.debian.org/queue/holding/";
+  Done "/srv/ftp-master.debian.org/queue/done/";
+  Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
 
 Queue-Report
@@ -366,16 +310,6 @@ DB
   Unicode "false"
 };
 
-Archive
-{
-  ftp-master
-  {
-    OriginServer "ftp-master.debian.org";
-    PrimaryMirror "ftp.debian.org";
-    Description "Master Archive for the Debian project";
-  };
-};
-
 Urgency
 {
   Default "low";
@@ -412,8 +346,6 @@ Generate-Releases
 {
   MD5Sum
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     stable;
     squeeze-updates;
@@ -424,8 +356,6 @@ Generate-Releases
   };
   SHA1
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;
@@ -436,8 +366,6 @@ Generate-Releases
   };
   SHA256
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;
@@ -447,3 +375,30 @@ Generate-Releases
     experimental;
   };
 }
+
+ByGroup {
+  dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
+  ftpteam "";
+  backports "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-backports";
+};
+
+Command::DM {
+  ACL "dm";
+  AdminKeyrings {
+    "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+  };
+  Keyrings {
+    "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
+  };
+};
+
+Command::DM-Admin {
+  AdminFingerprints {
+    "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf
+    "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles
+
+    "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar
+    "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg
+    "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy
+  };
+};