Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove magic_folder subsection from default tahoe.cfg #210

Merged
merged 2 commits into from
Dec 8, 2015
Merged

Remove magic_folder subsection from default tahoe.cfg #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5226c3
Remove magic_folder subsection from default tahoe.cfg
david415 Dec 7, 2015
bc0ff7d
remove magic_folder from config in test
david415 Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/allmydata/scripts/create_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,6 @@ def create_node(config, out=sys.stdout, err=sys.stderr):
c.write("enabled = false\n")
c.write("\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("# 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 = \n")
c.write("\n")

c.close()

from allmydata.util import fileutil
Expand Down
2 changes: 0 additions & 2 deletions src/allmydata/test/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,6 @@ def do_create(self, kind):
self.failUnless(re.search(r"\n\[storage\]\n#.*\nenabled = true\n", content), content)
self.failUnless("\nreserved_space = 1G\n" in content)

self.failUnless(re.search(r"\n\[magic_folder\]\n#.*\n#enabled = false\n", content), content)

# creating the node a second time should be rejected
rc, out, err = self.run_tahoe(argv)
self.failIfEqual(rc, 0, str((out, err, rc)))
Expand Down