summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-02-27 02:51:42 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-27 02:51:42 +0100
commit2803956ca1e4862d991e4112234b90c2cb79a36c (patch)
treec61f07bfb19112836897bc5ec500b680b4039ebb
parentf0ef2059fa5a5bbb65e7fd16817092066ad21112 (diff)
chmod +x merge.sh
Also fix path in README.
-rw-r--r--examples/docker-minimal/README2
-rwxr-xr-x[-rw-r--r--]examples/docker-minimal/docker/merge.sh0
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/docker-minimal/README b/examples/docker-minimal/README
index e0c5235..5c2606d 100644
--- a/examples/docker-minimal/README
+++ b/examples/docker-minimal/README
@@ -19,7 +19,7 @@ submissions on https://127.0.0.1:8080/.
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.
+directory and run examples/docker-minimal/docker/merge.sh.
To submit a cert chain and verify the resulting SCT, try the
diff --git a/examples/docker-minimal/docker/merge.sh b/examples/docker-minimal/docker/merge.sh
index 2457428..2457428 100644..100755
--- a/examples/docker-minimal/docker/merge.sh
+++ b/examples/docker-minimal/docker/merge.sh