diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-03-04 22:48:40 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-03-04 22:48:40 +0100 |
| commit | a706e79fa722f681320fe1b05824352b6b9a63fc (patch) | |
| tree | 41907841f09f19d93adfab91eb314bb0789851f9 /doc | |
| parent | f800e5fae8f9579328477b3bc3e939d9f4369d32 (diff) | |
| parent | e0f11a58033d52c70bc76b4b5611cb88485d4653 (diff) | |
Merge branch 'extsign'
Diffstat (limited to 'doc')
| -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. |