From: Daira Hopwood Date: Fri, 23 Oct 2015 21:05:34 +0000 (+0100) Subject: Don't include [magic_folder]enabled and local.directory fields by default. X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=d0515a74272fe8f3d1a204265267ba00c66328e6;p=tahoe-lafs%2Ftahoe-lafs.git 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 --- diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py index f5718ae2..e4d2f20d 100644 --- 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 a9787a15..8be94c92 100644 --- 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")