From d7013c9617d0740976a78ba87b1214c2b15ee702 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 13:16:12 +0200
Subject: Automatically create CA state dir, and make sure the CA scripts look
 for the templates in the right places.

---
 nova/CA/geninter.sh  | 2 +-
 nova/CA/genrootca.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'nova/CA')

diff --git a/nova/CA/geninter.sh b/nova/CA/geninter.sh
index 1fbcc9e73e..4b7f5a55c7 100755
--- a/nova/CA/geninter.sh
+++ b/nova/CA/geninter.sh
@@ -23,7 +23,7 @@ mkdir -p projects/$NAME
 cd projects/$NAME
 cp ../../openssl.cnf.tmpl openssl.cnf
 sed -i -e s/%USERNAME%/$NAME/g openssl.cnf
-mkdir certs crl newcerts private
+mkdir -p certs crl newcerts private
 openssl req -new -x509 -extensions v3_ca -keyout private/cakey.pem -out cacert.pem -days 365 -config ./openssl.cnf -batch -nodes
 echo "10" > serial
 touch index.txt
diff --git a/nova/CA/genrootca.sh b/nova/CA/genrootca.sh
index 8f2c3ee3fe..091cf17fcb 100755
--- a/nova/CA/genrootca.sh
+++ b/nova/CA/genrootca.sh
@@ -20,8 +20,9 @@ if [ -f "cacert.pem" ];
 then
     echo "Not installing, it's already done."
 else
-    cp openssl.cnf.tmpl openssl.cnf
+    cp "$(dirname $0)/openssl.cnf.tmpl" openssl.cnf
     sed -i -e s/%USERNAME%/ROOT/g openssl.cnf
+    mkdir -p certs crl newcerts private
     openssl req -new -x509 -extensions v3_ca -keyout private/cakey.pem -out cacert.pem -days 365 -config ./openssl.cnf -batch -nodes
     touch index.txt
     echo "10" > serial
-- 
cgit v1.2.1