From: Felix Dörre <felix@dogcraft.de>
Date: Fri, 4 Jul 2014 21:54:23 +0000 (+0200)
Subject: [UPDATE-CONFIG] Move the generated keys to a more resonable location.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=cf0e37d9f924fb899463fcb2afa275a4794bc705;hp=8e5dd87cba8768994b17d3d559b050a84046b264

[UPDATE-CONFIG] Move the generated keys to a more resonable location.
---

diff --git a/doc/scripts/generateTruststore.sh b/doc/scripts/generateTruststore.sh
deleted file mode 100755
index 6b969026..00000000
--- a/doc/scripts/generateTruststore.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# this script imports the cacert root certs
-
-wget -N http://www.cacert.org/certs/root.crt
-wget -N http://www.cacert.org/certs/class3.crt
-
-keytool -importcert -keystore ../../config/cacerts.jks -file root.crt -alias root -storepass "changeit" $1
-keytool -importcert -keystore ../../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit" $1
-keytool -importcert -keystore ../../config/cacerts.jks -file testca.crt -alias own -storepass "changeit" $1
-
-keytool -list -keystore ../../config/cacerts.jks -storepass "changeit"
diff --git a/keys/.dirinfo b/keys/.dirinfo
new file mode 100644
index 00000000..c9087a3d
--- /dev/null
+++ b/keys/.dirinfo
@@ -0,0 +1,9 @@
+This directoy will contain keys created to test CAcert-gigi.
+generate them with doc/scripts/generateKeys.sh
+
+It may contain:
+
+testca/*
+testca.crt
+testca.key
+{api,secure,static,www}.{crt,key,csr,pkcs12}
diff --git a/doc/scripts/.gitignore b/keys/.gitignore
similarity index 100%
rename from doc/scripts/.gitignore
rename to keys/.gitignore
diff --git a/doc/scripts/generateKeys.sh b/keys/generateKeys.sh
similarity index 80%
rename from doc/scripts/generateKeys.sh
rename to keys/generateKeys.sh
index 80bbf895..48111cc1 100755
--- a/doc/scripts/generateKeys.sh
+++ b/keys/generateKeys.sh
@@ -21,7 +21,7 @@ openssl ca -cert testca.crt -keyfile testca.key -in $1.csr -out $1.crt -days 356
 
 openssl pkcs12 -inkey $1.key -in $1.crt -name $1 -export -passout pass:changeit -out $1.pkcs12
 
-keytool -importkeystore -noprompt -srckeystore $1.pkcs12 -destkeystore ../../config/keystore.pkcs12 -srcstoretype pkcs12 -deststoretype pkcs12 -srcstorepass "changeit" -deststorepass "changeit"
+keytool -importkeystore -noprompt -srckeystore $1.pkcs12 -destkeystore 	../config/keystore.pkcs12 -srcstoretype pkcs12 -deststoretype pkcs12 -srcstorepass "changeit" -deststorepass "changeit"
 
 }
 
@@ -30,4 +30,4 @@ genserver secure
 genserver static
 genserver api
 
-keytool -list -keystore ../../config/keystore.pkcs12 -storetype pkcs12 -storepass "changeit"
+keytool -list -keystore ../config/keystore.pkcs12 -storetype pkcs12 -storepass "changeit"
diff --git a/keys/generateTruststore.sh b/keys/generateTruststore.sh
new file mode 100755
index 00000000..a51481de
--- /dev/null
+++ b/keys/generateTruststore.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# this script imports the cacert root certs
+
+#wget -N http://www.cacert.org/certs/root.crt
+#wget -N http://www.cacert.org/certs/class3.crt
+
+#keytool -importcert -keystore ../config/cacerts.jks -file root.crt -alias root -storepass "changeit" $1
+#keytool -importcert -keystore ../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit" $1
+keytool -importcert -keystore ../config/cacerts.jks -file testca.crt -alias own -storepass "changeit" $1
+
+keytool -list -keystore ../config/cacerts.jks -storepass "changeit"
diff --git a/doc/scripts/selfsign.config b/keys/selfsign.config
similarity index 100%
rename from doc/scripts/selfsign.config
rename to keys/selfsign.config