iron.git

diff --git a/iron/libexec/Makefile.am b/iron/libexec/Makefile.am
index 321071c110221be8fe3a3e748a29eb4a21816e68..8470a037c51f3a8fbc41233d57331d30d50283bb 100644
--- a/iron/libexec/Makefile.am
+++ b/iron/libexec/Makefile.am
@@ -9,5 +9,6 @@ 	iron/iron-sh-shell\
 	iron/iron-ca\
 	iron/iron-certificate\
 	iron/iron-client\
-	iron/iron-service
+	iron/iron-service\
+	iron/iron-debug
 




diff --git a/iron/libexec/iron/iron-certificate b/iron/libexec/iron/iron-certificate
index efdec41eb4c3bfd66bdd0ead052270af304c056d..3c3967d05c28cd2b6caae6c1d9a30dbe0a345b85 100755
--- a/iron/libexec/iron/iron-certificate
+++ b/iron/libexec/iron/iron-certificate
@@ -19,10 +19,7 @@ 	client=$(basename $csrfile | sed -e 's/.csr$//')
 	CLIENT_CERTPATH=$RCDIR/$service/certs
 	CP=$CLIENT_CERTPATH/$client
 	test -d ${CP} || mkdir -p ${CP}
-	#openssl x509 -req -days 365 -CA $CAPATH/ca.crt -CAkey $CAPATH/ca.key -CAcreateserial -in $CP/$client.csr -out $CP/$client.crt
 	openssl x509 -req -days 365 -CA $CAPATH/ca.crt -CAkey $CAPATH/ca.key -CAcreateserial -in $csrfile -out $CP/$client.crt
-	#test -f $CP/$client.crt && echo "Created certificate in [$CP/$client.crt]"
-	cat $CP/$client.crt
 }
 
 function remote_client_write_setup()
@@ -41,13 +38,14 @@ 	remote_csr_user=$2
 	remote_csr_host=$3
 	remote_csrfile=$4
 	csrfile=$(basename $remote_csrfile) 
+	remote_certdir=$(dirname $remote_csrfile) 
 	client=$(basename $csrfile | sed -e 's/.csr$//')
 	CLIENT_CERTPATH=$RCDIR/$service/certs
-	CP=$CLIENT_CERTPATH/$client test -d ${CP} || mkdir -p ${CP}
+	CP=$CLIENT_CERTPATH/$client 
+	test -d ${CP} || mkdir -p ${CP}
 	scp $remote_csr_user@$remote_csr_host:$remote_csrfile $CP/$client.csr
 	openssl x509 -req -days 365 -CA $CAPATH/ca.crt -CAkey $CAPATH/ca.key -CAcreateserial -in $CP/$client.csr -out $CP/$client.crt
-	scp $CP/$client.crt $REMOTE_USER@$REMOTE_HOST:$RCDIR/$CLIENT_CERTPATH/$client
-	cat $CP/$client.crt
+	scp $CP/$client.crt $REMOTE_USER@$REMOTE_HOST:$remote_certdir
 }
 
 function certificate_create()
@@ -83,7 +81,7 @@ 		test -f $CLIENT_RCFILE || ( echo "Edit $CLIENT_RCFILE first" && remote_client_write_setup  ; exit -1)
 		test -f $CLIENT_RCFILE && source ${CLIENT_RCFILE}
 		remote_csr_user=$REMOTE_USER
 		remote_csr_host=$REMOTE_HOST
-		remote_csrfile=$REMOTE_RCDIR/$service/certs/$client.csr
+		remote_csrfile=$REMOTE_RCDIR/$service/certs/$client/$client.csr
 		remote_certificate_sign $service $remote_csr_user $remote_csr_host $remote_csrfile
 	fi 
 else




diff --git a/iron/libexec/iron/iron-client b/iron/libexec/iron/iron-client
index bd9e0f54341b29a293b049637b1e89028dae57a5..cca06eae9987034556e9ff056353c3396b05bf4c 100755
--- a/iron/libexec/iron/iron-client
+++ b/iron/libexec/iron/iron-client
@@ -90,9 +90,9 @@ 		source ${RCFILE}
 		client_create_csr $service $client
 	fi 
 	if [ "$operation" = "setup" ]; then
-		test -f ${RCFILE} || ( client_home_setup_write ; echo "Edit values in ${RCFILE}"; exit 0) 
-		source ${RCFILE}
-		client_home_setup_write $service $client
+		test -f ${RCFILE} || ( client_home_setup_write $service $client; echo "Edit values in ${RCFILE}"; exit 0) 
+		#source ${RCFILE}
+		#client_home_setup_write $service $client
 	fi 
 	if [ "$operation" = "delete" ]; then
 		source ${RCFILE}




diff --git a/iron/libexec/iron/iron-debug b/iron/libexec/iron/iron-debug
new file mode 100755
index 0000000000000000000000000000000000000000..202cdf4c3ca4a1344e62644cb9cd0f13dd176e8b
--- /dev/null
+++ b/iron/libexec/iron/iron-debug
@@ -0,0 +1,27 @@
+#! /bin/bash 
+# Usage: $iron debug <pkcs12> <certificate.p12>
+# Summary: manage CA
+# Help: This command groups commands used to setup config create delete a CA
+
+
+APPNAME="iron"
+CURRDIR=$(pwd)
+
+RCDIR=$HOME/.$APPNAME
+test -d $RCDIR || mkdir -p $RCDIR
+CURRENT_TSTAMP=$(date '+%Y%m%d%H%M')
+
+if [ "$#" = 2 ];then
+	operation=$1
+	fileio=$2
+	RCFILE="$HOME/"."$APPNAME/default-ca"".env"
+	if [ "$operation" = "pkcs12" ]; then
+		keytool -list -keystore $fileio \
+	-storetype PKCS12 -v
+	#-storepass xxxxxx 
+	fi 
+else
+	echo "Usage: iron debug <pkcs12> <certificate.p12>"
+	exit -1
+fi
+