X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=setup%2Fdak-minimal.conf.template;h=3b6b27add119181e48cf008d11a518e530afda67;hb=394eaf39d605f9b0e916d25d3d5cd223b0c5246e;hp=7f4c9dfa610c8209db1ea0758207c1a5a1ac93a3;hpb=efe39a90214db10e0a993a2aa2d236edcae46016;p=dak.git

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 7f4c9dfa..3b6b27ad 100644
--- 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,6 +35,7 @@ Dinstall
 
 Dir
 {
+  Base "__DAKBASE__";
   Root "__DAKBASE__/ftp/";
   Pool "__DAKBASE__/ftp/pool/";
   Templates "__DAKBASE__/templates/";
@@ -48,15 +44,14 @@ Dir
   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/";
-    Reject "__DAKBASE__/queue/reject/";
-    Unchecked "__DAKBASE__/queue/unchecked/";
-  };
+Rm
+{
+  LogFile "__DAKBASE__/log/removals.txt";
+  LogFile822 "__DAKBASE__/log/removals.822";
 };
 
 Urgency