Don't include [magic_folder]enabled and local.directory fields by default.

Add a comment reminding to do the field modification properly.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index f5718ae26e17d23ba577c453d0099c5c74f0e451..e4d2f20d38198314fea0d140f775aa1b648dfb97 100644 (file)
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -153,12 +153,12 @@ def create_node(config, out=sys.stdout, err=sys.stderr):
     c.write("enabled = false\n")
     c.write("\n")
 
-    c.write("[drop_upload]\n")
+    c.write("[magic_folder]\n")
     c.write("# Shall this node automatically upload files created or modified in a local directory?\n")
-    c.write("enabled = false\n")
+    c.write("#enabled = false\n")
     c.write("# To specify the target of uploads, a mutable directory writecap URI must be placed\n"
             "# in '%s'.\n" % os.path.join('private', 'magic_folder_dircap'))
-    c.write("local.directory = ~/drop_upload\n")
+    c.write("#local.directory = \n")
     c.write("\n")
 
     c.close()

diff --git a/src/allmydata/scripts/magic_folder_cli.py b/src/allmydata/scripts/magic_folder_cli.py
index a9787a15ca534dd64a2918a667dab4f16b7b3614..8be94c92405967532073d86952cdae2cf3295691 100644 (file)
--- a/src/allmydata/scripts/magic_folder_cli.py
+++ b/src/allmydata/scripts/magic_folder_cli.py
@@ -152,6 +152,8 @@ def join(options):
 
     fileutil.write(dmd_cap_file, dmd_write_cap)
     fileutil.write(collective_readcap_file, magic_readonly_cap)
+
+    # FIXME: modify any existing [magic_folder] fields, rather than appending.
     fileutil.write(os.path.join(options["node-directory"], u"tahoe.cfg"),
                    "[magic_folder]\nenabled = True\nlocal.directory = %s\n"
                    % (options.local_dir.encode('utf-8'),), mode="ab")