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>
This commit is contained in:
Daira Hopwood 2015-10-23 22:05:34 +01:00
parent 01a8719179
commit d0515a7427
2 changed files with 5 additions and 3 deletions

View File

@ -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()

View File

@ -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")