Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / setup / dak-minimal.conf.template

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index c6f179a794f9fdd152336d3b7211b1e8584e2c18..a16f343918df970c5922dbe96a0de19a88f539b7 100644 (file)
--- a/setup/dak-minimal.conf.template
+++ b/setup/dak-minimal.conf.template
@@ -18,7 +18,6 @@ Dinstall
 {
    SigningKeyring "__DAKBASE__/keyrings/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "__DAKBASE__/keyrings/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "__ARCHIVEKEYID__";
 
    Options
    {
@@ -29,10 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   LockFile "__DAKBASE__/lock/dinstall.lock";
-
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 10;
 
    DefaultSuite "unstable";
@@ -40,23 +35,22 @@ Dinstall
 
 Dir
 {
+  Base "__DAKBASE__";
   Root "__DAKBASE__/ftp/";
   Pool "__DAKBASE__/ftp/pool/";
   Templates "__DAKBASE__/templates/";
   Log "__DAKBASE__/log/";
   Lock "__DAKBASE__/lock/";
   Morgue "__DAKBASE__/morgue/";
-  Holding "__DAKBASE__/holding/";
   Done "__DAKBASE__/done/";
   Reject "__DAKBASE__/reject/";
+  TempPath "__DAKBASE__/tmp/";
+};
 
-  Queue
-  {
-    Byhand "__DAKBASE__/queue/byhand/";
-    New "__DAKBASE__/queue/new/";
-    NewStage "__DAKBASE__/queue/newstage/";
-    Unchecked "__DAKBASE__/queue/unchecked/";
-  };
+Rm
+{
+  LogFile "__DAKBASE__/log/removals.txt";
+  LogFile822 "__DAKBASE__/log/removals.822";
 };
 
 Urgency