Merge branch 'master' of https://github.com/timprepscius/mailiverse

java/ext/.gitignore

@@ -1,2 +1,4 @@
 lcrypto-jdk15on-*
 bc-packaged
+bc-project
+

java/ext/bc-project

@@ -1 +0,0 @@
-lcrypto-jdk15on-149

java/ext/jordanzimmerman/build.xml

@@ -10,7 +10,7 @@
     <property name="Mailiverse.Core.location" value="../../core"/>
     <property name="Mailiverse.Mail-WebServer.location" value="../../webserver"/>
     <property name="ECLIPSE_HOME" value="../../../../../Desktop/eclipse"/>
-    <property name="Mailiverse.Ext.BouncyCastle.location" value="../lcrypto-jdk15on-148"/>
+    <property name="Mailiverse.Ext.BouncyCastle.location" value="../bouncycastle"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.6"/>
     <property name="source" value="1.6"/>

java/ext/setup-bc

@@ -2,6 +2,8 @@ set -x
 
 wget http://www.bouncycastle.org/download/lcrypto-jdk15on-149.tar.gz
 tar xzf lcrypto-jdk15on-*.tar.gz
-ln -fs lcrypto-jdk15on-* bc-project
+
+rm bc-project
+ln -fs lcrypto-jdk15on-*/ bc-project
 
 ./make-bc-packaged

keys/nginx/convert-authority

@@ -1,6 +1,6 @@
 set -x
 
-JKSSTORE=server.jks
+JKSSTORE=../primary/server.jks
 cp $JKSSTORE store.jks
 
 keytool -importkeystore -srckeystore store.jks -srcstoretype JKS -deststoretype PKCS12 -destkeystore store.p12

keys/nginx/convert-selfsigned

@@ -1,11 +1,31 @@
 set -x
 
-JKSSTORE=server.jks
+JKSSTORE=../primary/keystore.jks
 cp $JKSSTORE store.jks
 
-keytool -importkeystore -srckeystore store.jks -srcstoretype JKS -deststoretype PKCS12 -destkeystore store.p12
+echo "password
+password
+password" | keytool -importkeystore -srckeystore store.jks -srcstoretype JKS -deststoretype PKCS12 -destkeystore store.p12
+
+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 selfsignedcert.cer >> final.crt
+cat ../primary/selfsignedcert.cer >> final.crt

setup

@@ -0,0 +1,36 @@
+pushd ext
+tar -xzf apache-tomcat.tar.gz
+popd
+
+pushd java/ext
+./setup-bc
+popd
+
+pushd build
+./compile-java
+popd
+
+pushd passwords
+./make
+popd
+
+pushd keys
+  ./make
+
+  pushd primary
+  ./make-self-signed-key
+  popd
+
+  pushd nginx
+  ./convert-selfsigned
+  popd 
+popd
+
+echo 'Enter the name of your site (example: joesmail.com):'
+read site
+
+pushd config/hosts
+./make-prod $site
+./make-dev $site
+popd
+