From 7904519ca58fabe96353ce0a2b04b54d39cae4b4 Mon Sep 17 00:00:00 2001
From: Timothy Prepscius <tprepscius>
Date: Tue, 17 Sep 2013 22:38:47 -0400
Subject: [PATCH] working on big setup

---
 keys/nginx/convert-selfsigned | 24 ++++++++++++++++++++----
 setup                         | 12 ++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/keys/nginx/convert-selfsigned b/keys/nginx/convert-selfsigned
index d9a48d1..e7eea43 100755
--- a/keys/nginx/convert-selfsigned
+++ b/keys/nginx/convert-selfsigned
@@ -6,10 +6,26 @@ cp $JKSSTORE store.jks
 echo "password
 password
 password" | keytool -importkeystore -srckeystore store.jks -srcstoretype JKS -deststoretype PKCS12 -destkeystore store.p12
-echo "password
-password
-password" | openssl pkcs12 -in store.p12 -nocerts -out store.key
-echo "password" | openssl rsa -in store.key -out final.key
+
+echo '
+*****************
+*****************
+** Enter: "password" 3 times
+*****************
+*****************
+'
+
+openssl pkcs12 -in store.p12 -nocerts -out store.key
+
+echo '
+*****************
+*****************
+** Enter: "password" 3 times
+*****************
+*****************
+'
+
+openssl rsa -in store.key -out final.key
 
 rm final.crt
 cat ../primary/selfsignedcert.cer >> final.crt
diff --git a/setup b/setup
index 7d22220..cad0956 100755
--- a/setup
+++ b/setup
@@ -15,10 +15,18 @@ pushd passwords
 popd
 
 pushd keys
-./make
+  ./make
+
+  pushd primary
+  ./make-self-signed-key
+  popd
+
+  pushd nginx
+  ./convert-selfsigned
+  popd 
 popd
 
-echo Enter the name of your site (example: joesmail.com):
+echo 'Enter the name of your site (example: joesmail.com):'
 read site
 
 pushd config/hosts