From 4a2fdc8bd0acb29c650a103f90fb6a2ba0235659 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 14 Sep 2017 16:21:36 +0200
Subject: Updated OCSP scripts.

---
 scripts/ocsp-create.sh           |  6 +++---
 scripts/ocsp-standalone-step1.sh | 12 +++++++++---
 scripts/ocsp-standalone-step2.sh | 18 +++++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/scripts/ocsp-create.sh b/scripts/ocsp-create.sh
index ad018a4..ce84854 100755
--- a/scripts/ocsp-create.sh
+++ b/scripts/ocsp-create.sh
@@ -4,7 +4,7 @@ mkdir -p tmp
 
 cat > tmp/ocsp.cfg << EOF
 [DEFAULT]
-#pki_pin=Secret.123
+pki_pin=Secret.123
 
 [OCSP]
 pki_admin_cert_file=/root/.dogtag/pki-tomcat/ca_admin.cert
@@ -40,8 +40,8 @@ pki_token_password=Secret.123
 
 pki_ocsp_signing_nickname=ocsp_signing
 pki_audit_signing_nickname=ocsp_audit_signing
-pki_ssl_server_nickname=sslserver
+pki_sslserver_nickname=sslserver
 pki_subsystem_nickname=subsystem
 EOF
 
-pkispawn -v -f tmp/ocsp.cfg -s OCSP -v
+pkispawn -f tmp/ocsp.cfg -s OCSP
diff --git a/scripts/ocsp-standalone-step1.sh b/scripts/ocsp-standalone-step1.sh
index 50c9df7..50c284a 100755
--- a/scripts/ocsp-standalone-step1.sh
+++ b/scripts/ocsp-standalone-step1.sh
@@ -32,15 +32,21 @@ pki_external_step_two=False
 
 pki_ocsp_signing_nickname=ocsp_signing
 pki_audit_signing_nickname=ocsp_audit_signing
-pki_ssl_server_nickname=sslserver
+pki_sslserver_nickname=sslserver
 pki_subsystem_nickname=subsystem
-pki_cert_chain_nickname=ca_signing
+#pki_cert_chain_nickname=ca_signing
 
 pki_external_admin_csr_path=$PWD/tmp/ocsp_admin.csr
 pki_external_audit_signing_csr_path=$PWD/tmp/ocsp_audit_signing.csr
 pki_external_signing_csr_path=$PWD/tmp/ocsp_signing.csr
 pki_external_sslserver_csr_path=$PWD/tmp/sslserver.csr
 pki_external_subsystem_csr_path=$PWD/tmp/subsystem.csr
+
+pki_admin_csr_path=$PWD/tmp/ocsp_admin.csr
+pki_audit_signing_csr_path=$PWD/tmp/ocsp_audit_signing.csr
+pki_ocsp_signing_csr_path=$PWD/tmp/ocsp_signing.csr
+pki_sslserver_csr_path=$PWD/tmp/sslserver.csr
+pki_subsystem_csr_path=$PWD/tmp/subsystem.csr
 EOF
 
-pkispawn -v -f tmp/ocsp-standalone-step1.cfg -s OCSP
+pkispawn -f tmp/ocsp-standalone-step1.cfg -s OCSP -v
diff --git a/scripts/ocsp-standalone-step2.sh b/scripts/ocsp-standalone-step2.sh
index 91a15bc..5737ddb 100755
--- a/scripts/ocsp-standalone-step2.sh
+++ b/scripts/ocsp-standalone-step2.sh
@@ -30,19 +30,27 @@ pki_token_password=Secret.123
 pki_standalone=True
 pki_external_step_two=True
 
+#pki_cert_chain_nickname=ca_signing
+pki_cert_chain_nickname=Root CA Signing Certificate - ROOT
+#pki_external_ca_cert_chain_path=$PWD/tmp/cert_chain.p7b
+pki_external_ca_cert_path=$PWD/tmp/ca_signing.crt
+
 pki_ocsp_signing_nickname=ocsp_signing
 pki_audit_signing_nickname=ocsp_audit_signing
-pki_ssl_server_nickname=sslserver
+pki_sslserver_nickname=sslserver
 pki_subsystem_nickname=subsystem
-pki_cert_chain_nickname=ca_signing
 
-#pki_external_ca_cert_chain_path=$PWD/tmp/cert_chain.p7b
-pki_external_ca_cert_path=$PWD/tmp/ca_signing.crt
 pki_external_admin_cert_path=$PWD/tmp/ocsp_admin.crt
 pki_external_signing_cert_path=$PWD/tmp/ocsp_signing.crt
 pki_external_audit_signing_cert_path=$PWD/tmp/ocsp_audit_signing.crt
 pki_external_sslserver_cert_path=$PWD/tmp/sslserver.crt
 pki_external_subsystem_cert_path=$PWD/tmp/subsystem.crt
+
+pki_admin_cert_path=$PWD/tmp/ocsp_admin.crt
+pki_ocsp_signing_cert_path=$PWD/tmp/ocsp_signing.crt
+pki_audit_signing_cert_path=$PWD/tmp/ocsp_audit_signing.crt
+pki_sslserver_cert_path=$PWD/tmp/sslserver.crt
+pki_subsystem_cert_path=$PWD/tmp/subsystem.crt
 EOF
 
-pkispawn -v -f tmp/ocsp-standalone-step2.cfg -s OCSP
+pkispawn -f tmp/ocsp-standalone-step2.cfg -s OCSP -v
-- 
cgit