From 165d90b2006f5b01f97f99b1c35f4848e95c5f3c Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 5 Jun 2015 16:36:00 +0200
Subject: Adjust `-c' argument addServer to reflect certificate naming scheme.

Also, add informative defaults.
---
 catlfish-dev-lunahsm/start.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'catlfish-dev-lunahsm')

diff --git a/catlfish-dev-lunahsm/start.sh b/catlfish-dev-lunahsm/start.sh
index 27a25e7..ab38be6 100644
--- a/catlfish-dev-lunahsm/start.sh
+++ b/catlfish-dev-lunahsm/start.sh
@@ -1,8 +1,12 @@
 #! /bin/sh
 
+[ -z "$HSM_SERVER_NAME" ] && HSM_SERVER_NAME=server-fqdn
+[ -z "$HSM_CLIENT_NAME" ] && HSM_CLIENT_NAME=client-fqdn
+
 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
+	-n ${HSM_SERVER_NAME} \
+        -c /usr/lunasa/cert/server/${HSM_SERVER_NAME}Cert.pem
     /usr/lunasa/bin/vtl createCert -n ${HSM_CLIENT_NAME}
 fi
 
-- 
cgit v1.1