From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 21 Jun 2014 19:46:56 +0000 (+0200)
Subject: Update keys scripts
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=91305af8e77fd4a3e5d093de825b49d34f4944fa

Update keys scripts

-nodes doesnt exist for "genrsa"
import own certificate in truststore
---

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..bd4647f6
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,3 @@
+jetty.crt
+jetty.csr
+jetty.key
diff --git a/doc/generateKeys.sh b/doc/generateKeys.sh
index 5ab40428..e0cdff9f 100755
--- a/doc/generateKeys.sh
+++ b/doc/generateKeys.sh
@@ -1,6 +1,6 @@
 # this script generates a simple self-signed keypair
 
-openssl genrsa -nodes -out jetty.key 4096
+openssl genrsa -out jetty.key 4096
 openssl req -new -key jetty.key -out jetty.csr -subj "/CN=localhost" -config selfsign.config
 openssl x509 -req -days 365 -in jetty.csr -signkey jetty.key -out jetty.crt
 openssl pkcs12 -inkey jetty.key -in jetty.crt -export -passout pass: -out ../config/keystore.pkcs12
diff --git a/doc/generateTruststore.sh b/doc/generateTruststore.sh
index 8092e924..aa8532d5 100644
--- a/doc/generateTruststore.sh
+++ b/doc/generateTruststore.sh
@@ -1,11 +1,10 @@
 # this script generates a simple self-signed keypair
 
-wget http://www.cacert.org/certs/root.crt
-wget http://www.cacert.org/certs/class3.crt
+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"
 keytool -importcert -keystore ../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit"
-rm root.crt
-rm class3.crt
+keytool -importcert -keystore ../config/cacerts.jks -file jetty.crt -alias own -storepass "changeit"
 
 keytool -list -keystore ../config/cacerts.jks -storepass "changeit"