Merge remote-tracking branch 'origin/master' into description-md5

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

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 45c5d0f1f20023d55f5909a572bcb938138d2eb0..57f49489e62eea19a31b7f07b0efc82cba68100a 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,8 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   LockFile "__DAKBASE__/lock/dinstall.lock";
-
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 10;
@@ -49,6 +46,7 @@ Dir
   Holding "__DAKBASE__/holding/";
   Done "__DAKBASE__/done/";
   Reject "__DAKBASE__/reject/";
+  TempPath "__DAKBASE__/tmp/";
 };
 
 Urgency