ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-29 09:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Safely customize the Tor introducer's configuration

Browse Source 
Previously we clobbered the whole generated configuration and potentially
wiped out additional important fields.

Now we modify the configuration by just changing the fields we need to change.
This commit is contained in:
Jean-Paul Calderone 2023-03-27 13:32:40 -04:00
parent c478160988
commit fbcef2d1ae
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration/conftest.py
View File

@ -43,7 +43,7 @@ from .util import (
generate_ssh_key, generate_ssh_key,
block_with_timeout, block_with_timeout,
) )
from allmydata.node import read_config
# pytest customization hooks # pytest customization hooks
@ -275,13 +275,6 @@ def introducer_furl(introducer, temp_dir):
include_result=False, include_result=False,
) )
def tor_introducer(reactor, temp_dir, flog_gatherer, request): def tor_introducer(reactor, temp_dir, flog_gatherer, request):
config = '''
[node]
nickname = introducer_tor
web.port = 4561
log_gatherer.furl = {log_furl}
'''.format(log_furl=flog_gatherer)
intro_dir = join(temp_dir, 'introducer_tor') intro_dir = join(temp_dir, 'introducer_tor')
print("making introducer", intro_dir) print("making introducer", intro_dir)
@ -301,9 +294,11 @@ log_gatherer.furl = {log_furl}
) )
pytest_twisted.blockon(done_proto.done) pytest_twisted.blockon(done_proto.done)
# over-write the config file with our stuff # adjust a few settings
with open(join(intro_dir, 'tahoe.cfg'), 'w') as f: config = read_config(intro_dir, "tub.port")
f.write(config) config.set_config("node", "nickname", "introducer-tor")
config.set_config("node", "web.port", "4561")
config.set_config("node", "log_gatherer.furl", flog_gatherer)
# "tahoe run" is consistent across Linux/macOS/Windows, unlike the old # "tahoe run" is consistent across Linux/macOS/Windows, unlike the old
# "start" command. # "start" command.