From 43811a180ee2163ed2e21c305a9671b31cc37ef6 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Fri, 27 Feb 2015 14:55:51 +0100 Subject: Updating documentation to reflect authentication changes --- doc/minimalsystem.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'doc') 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. -- cgit v1.1