Update from squeezer6

[dak.git] / docs / README.config

diff --git a/docs/README.config b/docs/README.config
index 760427e1f4510907740c9c6c7fd8253883c6bf92..7fabb4ee281b245a20afbf1f54cde999ab7d3b95 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -2,6 +2,15 @@
 // Example annotated configuration file for dak
 ///////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////
+// Common settings
+///////////////////////////////////////////////////////////
+Common
+{
+    //// ThreadCount (optional):  Maximum number of threads to use.  Defaults to 1
+    ThreadCount 1;
+};
+
 ///////////////////////////////////////////////////////////
 // Essential.  List of database details.
 ///////////////////////////////////////////////////////////
@@ -32,15 +41,6 @@ DB
     Unicode "false";
 };
 
-///////////////////////////////////////////////////////////
-// Common settings
-///////////////////////////////////////////////////////////
-Common
-{
-    //// ThreadCount (optional):  Maximum number of threads to use.  Defaults to 1
-    ThreadCount 1;
-};
-
 ///////////////////////////////////////////////////////////
 // Dinstall general settings
 ///////////////////////////////////////////////////////////
@@ -146,7 +146,7 @@ Dinstall
 
     //// KeyAutoFetch (optional): boolean (default: false), which if set (and
     //// not overriden by explicit argument to check_signature()) will enable
-    //// auto key retrieval.  Requires KeyServer and SigningKeyIds variables be
+    //// auto key retrieval.  Requires KeyServer variable be
     //// set.  NB: you should only enable this variable on production systems
     //// if you have strict control of your upload queue.
     // KeyAutoFetch "false";
@@ -186,6 +186,9 @@ Dir
     //// Log (required): Directory to store dak logs in
     Log "/srv/dak/log/";
 
+    //// Lock directory (required): Directory to store dak locks in
+    Lock "/srv/dak/lock/";
+
     //// Morgue (required): Removed files are moved there.  The morgue has various
     //// sub-directories, including (optionally) those defined by
     //// Clean-Queues::MorgueSubDir and Clean-Suites::MorgueSubDir.