From 1e37341a24644e6b3957521c42ca8cc33cbed2a0 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 27 Feb 2015 02:27:06 +0100
Subject: Update README and finish merge.sh in the minimal docker example.
---
examples/docker-minimal/README | 11 +++++++----
examples/docker-minimal/docker/merge.sh | 14 +++++++++++++-
2 files changed, 20 insertions(+), 5 deletions(-)
(limited to 'examples/docker-minimal')
diff --git a/examples/docker-minimal/README b/examples/docker-minimal/README
index 1bb2287..e0c5235 100644
--- a/examples/docker-minimal/README
+++ b/examples/docker-minimal/README
@@ -15,11 +15,14 @@ Run the newly created image in a docker container
This will create and start one container listening for cert chain
submissions on https://127.0.0.1:8080/.
-FIXME FIXME start shell script doing merge (i.e. generate a new STH)
-with an interval of 20 minutes, with the first merge occuring five
-minutes after startup.
+
+In order to start a shell script doing merge (i.e. generate new STH's)
+with an interval of 20 minutes (with the first merge occuring five
+minutes after startup) in the host system, cd into the catlfish
+directory and run catlfish/examples/docker-minimal/docker/merge.sh.
+
To submit a cert chain and verify the resulting SCT, try the
submitcert tool:
- $ tools/submitcert.py --store tools/testcerts/cert1.txt --check-sct --sct-file=/tmp/cert1-sct https://127.0.0.1:8080/
+ $ tools/submitcert.py --store=tools/testcerts/cert1.txt --check-sct --sct-file=/tmp/cert1-sct https://127.0.0.1:8080/
diff --git a/examples/docker-minimal/docker/merge.sh b/examples/docker-minimal/docker/merge.sh
index 5eda54d..2457428 100644
--- a/examples/docker-minimal/docker/merge.sh
+++ b/examples/docker-minimal/docker/merge.sh
@@ -1,9 +1,21 @@
#! /bin/sh
+mkdir mergedb
+mkdir mergedb/chains
+touch mergedb/logorder
+
+echo "merge: waiting five minutes before merging for the first time"
+sleep 300
+
while true; do
+ echo "merge: merging"
+ date
catlfish/tools/merge.py \
--baseurl https://127.0.0.1:8080/ \
--storage https://127.0.0.1:8081/ \
--frontend https://127.0.0.1:8082/ \
--mergedb mergedb \
- --keyfile test/eckey.pem
+ --keyfile examples/docker-minimal/docker/test/eckey.pem
+ echo "merge: waiting 20 minutes before merging again"
+ sleep 1200
+done
--
cgit v1.1