From c910b470e61a35230bc7ddaced13c3d51fac32fd Mon Sep 17 00:00:00 2001
From: andy <github@anarkystic.com>
Date: Thu, 24 Jun 2010 04:11:53 +0100
Subject: re-added cloudpipe

Conflicts:

	bin/nova-manage
	nova/auth/users.py
	nova/compute/network.py
---
 CA/geninter.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'CA')

diff --git a/CA/geninter.sh b/CA/geninter.sh
index ad3332ad9..2aa64a842 100755
--- a/CA/geninter.sh
+++ b/CA/geninter.sh
@@ -16,7 +16,7 @@
 
 
 # ARG is the id of the user
-
+export SUBJ=/C=US/ST=California/L=Mountain View/O=Anso Labs/OU=Nova Dev/CN=customer-intCA-$3
 mkdir INTER/$1
 cd INTER/$1
 cp ../../openssl.cnf.tmpl openssl.cnf
@@ -25,6 +25,6 @@ mkdir certs crl newcerts private
 echo "10" > serial
 touch index.txt
 openssl genrsa -out private/cakey.pem 1024 -config ./openssl.cnf -batch -nodes
-openssl req -new -sha1 -key private/cakey.pem -out ../../reqs/inter$1.csr -batch -subj "/C=US/ST=California/L=Mountain View/O=Anso Labs/OU=Nova Dev/CN=customer-intCA-$1"
+openssl req -new -sha2 -key private/cakey.pem -out ../../reqs/inter$1.csr -batch -subj "$SUBJ"
 cd ../../
-openssl ca -extensions v3_ca -days 365 -out INTER/$1/cacert.pem -in reqs/inter$1.csr -config openssl.cnf -batch
\ No newline at end of file
+openssl ca -extensions v3_ca -days 365 -out INTER/$1/cacert.pem -in reqs/inter$1.csr -config openssl.cnf -batch
-- 
cgit