Merge remote-tracking branch 'origin/dakweb'

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

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 42c6881dbc23132241ccbef85ed73ec37bf225ea..3b6b27add119181e48cf008d11a518e530afda67 100644 (file)
--- a/setup/dak-minimal.conf.template
+++ b/setup/dak-minimal.conf.template
@@ -28,10 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   LockFile "__DAKBASE__/lock/dinstall.lock";
-
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 10;
 
    DefaultSuite "unstable";
@@ -39,6 +35,7 @@ Dinstall
 
 Dir
 {
+  Base "__DAKBASE__";
   Root "__DAKBASE__/ftp/";
   Pool "__DAKBASE__/ftp/pool/";
   Templates "__DAKBASE__/templates/";
@@ -51,6 +48,12 @@ Dir
   TempPath "__DAKBASE__/tmp/";
 };
 
+Rm
+{
+  LogFile "__DAKBASE__/log/removals.txt";
+  LogFile822 "__DAKBASE__/log/removals.822";
+};
+
 Urgency
 {
   Default "low";