ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch to [storage] force_foolscap.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2022-11-15 14:36:14 -05:00
parent fb52b4d302
commit f3fc426830
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/allmydata/client.py
View File

@ -104,6 +104,7 @@ _client_config = configutil.ValidConfiguration(
"reserved_space", "reserved_space",
"storage_dir", "storage_dir",
"plugins", "plugins",
"force_foolscap",
), ),
"sftpd": ( "sftpd": (
"accounts.file", "accounts.file",

3
src/allmydata/node.py
View File

@ -64,7 +64,6 @@ def _common_valid_config():
"tcp", "tcp",
), ),
"node": ( "node": (
"force_foolscap",
"log_gatherer.furl", "log_gatherer.furl",
"nickname", "nickname",
"reveal-ip-address", "reveal-ip-address",
@ -916,7 +915,7 @@ def create_main_tub(config, tub_options,
# don't want to enable HTTP by default. # don't want to enable HTTP by default.
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3934 # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3934
force_foolscap=config.get_config( force_foolscap=config.get_config(
"node", "force_foolscap", default=True, boolean=True "storage", "force_foolscap", default=True, boolean=True
), ),
handler_overrides=handler_overrides, handler_overrides=handler_overrides,
certFile=certfile, certFile=certfile,

2
src/allmydata/test/common_system.py
View File

@ -814,7 +814,7 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
sethelper = partial(setconf, config, which, "helper") sethelper = partial(setconf, config, which, "helper")
setnode("nickname", u"client %d \N{BLACK SMILING FACE}" % (which,)) setnode("nickname", u"client %d \N{BLACK SMILING FACE}" % (which,))
setnode("force_foolscap", str(force_foolscap)) setconf(config, which, "storage", "force_foolscap", str(force_foolscap))
tub_location_hint, tub_port_endpoint = self.port_assigner.assign(reactor) tub_location_hint, tub_port_endpoint = self.port_assigner.assign(reactor)
setnode("tub.port", tub_port_endpoint) setnode("tub.port", tub_port_endpoint)