Merge bc0ff7d into 8fb40ed

src/allmydata/scripts/create_node.py

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

src/allmydata/test/test_runner.py

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