4 files changed, 5 insertions, 37 deletions
diff --git a/scripts/cert-request-approve.sh b/scripts/cert-request-approve.sh
index 162c2ee..f360323 100755
--- a/scripts/cert-request-approve.sh
+++ b/scripts/cert-request-approve.sh
@@ -8,7 +8,7 @@ fi
 
 SRC_DIR=`cd ../.. ; pwd`
 INSTANCE_NAME=ca-master
-CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/ca/certs
+CLIENT_CERT_DIR=$HOME/.pki/${INSTANCE_NAME}_ca/alias
 
 # Approve request as an agent
-pki -v -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-approve "$INPUT"
+pki -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-approve "$INPUT"
diff --git a/scripts/cert-request-review.sh b/scripts/cert-request-review.sh
index ba9bc34..e3184be 100755
--- a/scripts/cert-request-review.sh
+++ b/scripts/cert-request-review.sh
@@ -9,7 +9,7 @@ fi
 
 SRC_DIR=`cd ../.. ; pwd`
 INSTANCE_NAME=ca-master
-CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/ca/certs
+CLIENT_CERT_DIR=$HOME/.pki/${INSTANCE_NAME}_ca/alias
 
 # Review request as an agent
-pki -v -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --output "$OUTPUT"
+pki -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --output "$OUTPUT"
diff --git a/scripts/cert-request-submit.sh b/scripts/cert-request-submit.sh
index f7a53d3..ace04ce 100755
--- a/scripts/cert-request-submit.sh
+++ b/scripts/cert-request-submit.sh
@@ -7,4 +7,4 @@ if [ "$INPUT" == "" ]; then
 fi
 
 # Submit request anonymously
-pki -v cert-request-submit "$INPUT"
+pki cert-request-submit "$INPUT"
diff --git a/scripts/cert-request.xml b/scripts/cert-request.xml
deleted file mode 100644
index 5468147..0000000
--- a/scripts/cert-request.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CertEnrollmentRequest>
-    <profileId>caUserCert</profileId>
-    <isRenewal>false</isRenewal>
-    <Input>
-        <InputAttrs>
-            <InputAttr name="cert_request_type">crmf</InputAttr>
-            <InputAttr name="cert_request">MIIBozCCAZ8wggEFAgQBMQp8MIHHgAECpQ4wDDEKMAgGA1UEAxMBeKaBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2NgaPHp0jiohcP4M+ufrJOZEqH8GV+liu5JLbT8nWpkfhC+8EUBqT6g+n3qroSxIcNVGNdcsBEqs1utvpItzyslAbpdyat3WwQep1dWMzo6RHrPDuIoxNA0Yka1n3qEX4U//08cLQtUv2bYglYgN/hOCNQemLV6vZWAv0n7zelkCAwEAAakQMA4GA1UdDwEB/wQEAwIF4DAzMBUGCSsGAQUFBwUBAQwIcmVnVG9rZW4wGgYJKwYBBQUHBQECDA1hdXRoZW50aWNhdG9yoYGTMA0GCSqGSIb3DQEBBQUAA4GBAJ1VOQcaSEhdHa94s8kifVbSZ2WZeYE5//qxL6wVlEst20vq4ybj13CetnbN3+WT49Zkwp7Fg+6lALKgSk47suTg3EbbQDm+8yOrC0nc/q4PTRoHl0alMmUxIhirYc1t3xoCMqJewmjX1bNP8lpVIZAYFZo4eZCpZaiSkM5BeHhz</InputAttr>
-        </InputAttrs>
-        <inputId>KeyGenInput</inputId>
-    </Input>
-    <Input>
-        <InputAttrs>
-            <InputAttr name="sn_uid">testuser</InputAttr>
-            <InputAttr name="sn_e">testuser@example.com</InputAttr>
-            <InputAttr name="sn_c">US</InputAttr>
-            <InputAttr name="sn_ou">Engineering</InputAttr>
-            <InputAttr name="sn_cn">Test User</InputAttr>
-            <InputAttr name="sn_o">Example</InputAttr>
-        </InputAttrs>
-        <inputId>SubjectNameInput</inputId>
-    </Input>
-    <Input>
-        <InputAttrs>
-            <InputAttr name="requestor_name">admin</InputAttr>
-            <InputAttr name="requestor_email">admin@example.com</InputAttr>
-            <InputAttr name="requestor_phone">123-456-7890</InputAttr>
-        </InputAttrs>
-        <inputId>SubmitterInfoInput</inputId>
-    </Input>
-</CertEnrollmentRequest>
-