From b5d4972a7a28574762665f89bb119c51f54a3efa Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@allmydata.com>
Date: Mon, 23 Mar 2009 16:08:20 -0700
Subject: [PATCH] move GC docs out of proposed/, since it's all implemented
 now. Add reference to configuration.txt . Add expire.*= suggestions to
 tahoe.cfg .

---
 docs/configuration.txt                     | 11 +++++++++++
 docs/{proposed => }/garbage-collection.txt |  0
 src/allmydata/scripts/create_node.py       |  2 ++
 3 files changed, 13 insertions(+)
 rename docs/{proposed => }/garbage-collection.txt (100%)

diff --git a/docs/configuration.txt b/docs/configuration.txt
index 6df08624..994f9ac9 100644
--- a/docs/configuration.txt
+++ b/docs/configuration.txt
@@ -310,6 +310,17 @@ reserved_space = (str, optional)
  "100MB", "100M", "100000000B", "100000000", and "100000kb" all mean the same
  thing. Likewise, "1MiB", "1024KiB", and "1048576B" all mean the same thing.
 
+expire.enabled =
+expire.mode =
+expire.override_lease_duration =
+expire.cutoff_date =
+expire.immutable =
+expire.mutable =
+
+ These settings control garbage-collection, in which the server will delete
+ shares that no longer have an up-to-date lease on them. Please see the
+ neighboring "garbage-collection.txt" document for full details.
+
 
 == Running A Helper ==
 
diff --git a/docs/proposed/garbage-collection.txt b/docs/garbage-collection.txt
similarity index 100%
rename from docs/proposed/garbage-collection.txt
rename to docs/garbage-collection.txt
diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index b1d1c86c..7a20ded1 100644
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -115,6 +115,8 @@ def create_client(basedir, config, out=sys.stdout, err=sys.stderr):
     c.write("enabled = %s\n" % boolstr[storage_enabled])
     c.write("#readonly =\n")
     c.write("#reserved_space =\n")
+    c.write("#expire.enabled =\n")
+    c.write("#expire.mode =\n")
     c.write("\n")
 
     c.write("[helper]\n")
-- 
2.45.2