diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-02-27 14:55:51 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-02-27 14:57:11 +0100 |
| commit | 43811a180ee2163ed2e21c305a9671b31cc37ef6 (patch) | |
| tree | f58a3923e105d941ecd9e219795b5491a02c71c8 /doc/minimalsystem.txt | |
| parent | 95bf10b2934f58fbeb7fd6d44a4e92eba492b431 (diff) | |
Updating documentation to reflect authentication changes
Diffstat (limited to 'doc/minimalsystem.txt')
| -rw-r--r-- | doc/minimalsystem.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/minimalsystem.txt b/doc/minimalsystem.txt index d0a5cee..9a097e5 100644 --- a/doc/minimalsystem.txt +++ b/doc/minimalsystem.txt @@ -49,7 +49,13 @@ directory, use the directory name with a `/` at the end, for example Running merge ------------- - tools/merge.py --baseurl https://127.0.0.1:8080/ --frontend https://127.0.0.1:8082/ --storage https://127.0.0.1:8081/ --mergedb rel/mergedb --keyfile rel/test/eckey.pem + tools/merge.py --baseurl https://127.0.0.1:8080/ \ + --frontend https://127.0.0.1:8082/ \ + --storage https://127.0.0.1:8081/ \ + --mergedb rel/mergedb \ + --keyfile rel/test/eckey.pem \ + --own-keyname merge-1 \ + --own-keyfile rel/privatekeys/merge-1-private.pem This will read the submitted certificates from the storage node, decide the order, and publish the certificates to the frontend server. |