ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-08 04:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor; make doc match code

Browse Source
This commit is contained in:
meejah 2018-05-18 18:17:20 -06:00
parent 4d40977665
commit 7803febf2d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/proposed/grid-manager/managed-grid.rst
View File

@ -82,8 +82,8 @@ directory specified by the ``--config`` option. It is an error if the
directory already exists. directory already exists.
tahoe grid-manager show-identity tahoe grid-manager public-identity
```````````````````````````````` ``````````````````````````````````
Print out a grid-manager's public key. This key is derived from the Print out a grid-manager's public key. This key is derived from the
private-key of the grid-manager, so a valid grid-manager config must private-key of the grid-manager, so a valid grid-manager config must
@ -105,6 +105,13 @@ configuration. (Since it mutates the configuration, if you used
``--config -`` the new configuration will be printed to stdout). ``--config -`` the new configuration will be printed to stdout).
tahoe grid-manager list
```````````````````````
Lists all storage-servers that have previously been added using
``tahoe grid-manager add``.
tahoe grid-manager sign tahoe grid-manager sign
``````````````````````` ```````````````````````

7
src/allmydata/scripts/tahoe_grid_manager.py
View File

@ -176,6 +176,10 @@ class _GridManager(object):
def storage_servers(self): def storage_servers(self):
return self._storage_servers return self._storage_servers
def public_identity(self):
verify_key_bytes = self._private_key.get_verifying_key_bytes()
return base32.b2a(verify_key_bytes)
def sign(self, name): def sign(self, name):
try: try:
public_key = self._storage_servers[name] public_key = self._storage_servers[name]
@ -274,8 +278,7 @@ def _show_identity(gridoptions, options):
assert gm_config is not None assert gm_config is not None
gm = _load_gridmanager_config(gm_config) gm = _load_gridmanager_config(gm_config)
verify_key_bytes = gm['private_key'].get_verifying_key_bytes() print(gm.public_identity())
print(base32.b2a(verify_key_bytes))
def _add(gridoptions, options): def _add(gridoptions, options):