summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-06-05 14:30:33 +0200
committerLinus Nordberg <linus@nordu.net>2015-06-05 14:33:55 +0200
commit014495122d6c2c73f4e183b831af477d4fd0dd94 (patch)
tree1321cc791e430549448e3a641a3831e0a27e25b2
parente21514105975f34d5c820c8446c1dd8178c3e775 (diff)
Add catlfish-dev-lunahsm.
-rw-r--r--Makefile6
-rw-r--r--catlfish-dev-lunahsm/Dockerfile8
-rw-r--r--catlfish-dev-lunahsm/luna-debs/configurator_5.1.0-26_amd64.debbin0 -> 22742 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/libcryptoki_5.1.0-26_amd64.debbin0 -> 1499490 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/libshim_5.1.0-26_amd64.debbin0 -> 114378 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/lunacmu_5.1.0-26_amd64.debbin0 -> 1173392 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/multitoken_5.1.0-26_amd64.debbin0 -> 123848 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/salogin_5.1.0-26_amd64.debbin0 -> 42636 bytes
-rw-r--r--catlfish-dev-lunahsm/luna-debs/vtl_5.1.0-26_amd64.debbin0 -> 990528 bytes
-rw-r--r--catlfish-dev-lunahsm/start.sh9
10 files changed, 20 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2ff2935..bb77ac8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-catlfish-dev:
- docker build --no-cache --rm -t catlfish-dev:latest catlfish-dev
+catlfish-dev catlfish-dev-lunahsm:
+ docker build --no-cache --rm -t $@:latest $@
catlfish:
FIXME
-.PHONY: catlfish-dev catlfish
+.PHONY: catlfish-dev catlfish-dev-lunahsm
diff --git a/catlfish-dev-lunahsm/Dockerfile b/catlfish-dev-lunahsm/Dockerfile
new file mode 100644
index 0000000..78f4ebe
--- /dev/null
+++ b/catlfish-dev-lunahsm/Dockerfile
@@ -0,0 +1,8 @@
+FROM catlfish-dev
+USER root
+RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
+ADD luna-debs /tmp/
+RUN dpkg -i /tmp/*.deb
+VOLUME /usr/lunasa/cert
+ADD start.sh /
+ENTRYPOINT ["/start.sh"]
diff --git a/catlfish-dev-lunahsm/luna-debs/configurator_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/configurator_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..b8949c9
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/configurator_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/libcryptoki_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/libcryptoki_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..8698457
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/libcryptoki_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/libshim_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/libshim_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..324df41
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/libshim_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/lunacmu_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/lunacmu_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..73e3b98
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/lunacmu_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/multitoken_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/multitoken_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..be4a9bb
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/multitoken_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/salogin_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/salogin_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..c05daa5
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/salogin_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/luna-debs/vtl_5.1.0-26_amd64.deb b/catlfish-dev-lunahsm/luna-debs/vtl_5.1.0-26_amd64.deb
new file mode 100644
index 0000000..5239d3a
--- /dev/null
+++ b/catlfish-dev-lunahsm/luna-debs/vtl_5.1.0-26_amd64.deb
Binary files differ
diff --git a/catlfish-dev-lunahsm/start.sh b/catlfish-dev-lunahsm/start.sh
new file mode 100644
index 0000000..27a25e7
--- /dev/null
+++ b/catlfish-dev-lunahsm/start.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+if ! [ -e /usr/lunasa/cert/client/catlfishKey.pem ]; then
+ /usr/lunasa/bin/vtl addServer \
+ -n ${HSM_SERVER_NAME} -c /usr/lunasa/cert/server/${HSM_SERVER_NAME}.pem
+ /usr/lunasa/bin/vtl createCert -n ${HSM_CLIENT_NAME}
+fi
+
+su catlfish -c /var/run/catlfish/start.sh