diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-05 15:18:00 -0400 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-05 15:24:35 -0400 |
commit | 2676e9518437d88012968e19bd2926e8631d9828 (patch) | |
tree | ebb56cd4b67bbd348a6d7945f64807042b1e3ce9 | |
parent | 2320d009b917349b5eb2435c0823ab6f309d349f (diff) | |
download | pki-dev-2676e9518437d88012968e19bd2926e8631d9828.tar.gz pki-dev-2676e9518437d88012968e19bd2926e8631d9828.tar.xz pki-dev-2676e9518437d88012968e19bd2926e8631d9828.zip |
Updated scripts.
-rwxr-xr-x | scripts/cert-request-approve.sh | 2 | ||||
-rwxr-xr-x | scripts/cert-request-reject.sh | 2 | ||||
-rwxr-xr-x | scripts/cert-request-review.sh | 2 | ||||
-rwxr-xr-x | scripts/core-install.sh | 2 | ||||
-rwxr-xr-x | scripts/firefox-certs-import.sh | 8 | ||||
-rwxr-xr-x | scripts/kra-remove.sh | 2 | ||||
-rw-r--r-- | scripts/kra.cfg | 1 | ||||
-rw-r--r-- | scripts/password | 1 | ||||
-rwxr-xr-x | scripts/ra-configure.sh | 6 |
9 files changed, 16 insertions, 10 deletions
diff --git a/scripts/cert-request-approve.sh b/scripts/cert-request-approve.sh index d0c46ae..78b3189 100755 --- a/scripts/cert-request-approve.sh +++ b/scripts/cert-request-approve.sh @@ -4,7 +4,7 @@ REQUEST_ID=$1 SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=ca-master -CLIENT_CERT_DIR=$HOME/.pki/${INSTANCE_NAME}/ca/alias +CLIENT_CERT_DIR=$HOME/.dogtag/${INSTANCE_NAME}/ca/alias # Approve request as an agent pki -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --action approve diff --git a/scripts/cert-request-reject.sh b/scripts/cert-request-reject.sh index 758063a..244b24f 100755 --- a/scripts/cert-request-reject.sh +++ b/scripts/cert-request-reject.sh @@ -4,7 +4,7 @@ REQUEST_ID=$1 SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=ca-master -CLIENT_CERT_DIR=$HOME/.pki/${INSTANCE_NAME}/ca/alias +CLIENT_CERT_DIR=$HOME/.dogtag/${INSTANCE_NAME}/ca/alias # Reject request as an agent pki -d $CLIENT_CERT_DIR -c Secret123 -n caadmin cert-request-review "$REQUEST_ID" --action reject diff --git a/scripts/cert-request-review.sh b/scripts/cert-request-review.sh index e636611..5f1a018 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=$HOME/.pki/${INSTANCE_NAME}/ca/alias +CLIENT_CERT_DIR=$HOME/.dogtag/${INSTANCE_NAME}/ca/alias # Review request as an agent pki -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --output "$OUTPUT" diff --git a/scripts/core-install.sh b/scripts/core-install.sh index f12fea2..86fc7cb 100755 --- a/scripts/core-install.sh +++ b/scripts/core-install.sh @@ -6,4 +6,4 @@ COMPONENT=core cd $WORK_DIR/build/$COMPONENT/repo -yum install -y *.rpm +yum localinstall -y *.rpm diff --git a/scripts/firefox-certs-import.sh b/scripts/firefox-certs-import.sh index 26b76be..07d44e0 100755 --- a/scripts/firefox-certs-import.sh +++ b/scripts/firefox-certs-import.sh @@ -51,7 +51,7 @@ certutil -A -d $FIREFOX_DIR/$PROFILE -n "$SERVER_CERT_NAME" -i $CA_CERT_DIR/serv # Importing CA admin certificate ################################################################################ -CA_ADMIN_CERT_P12=/root/.pki/$CA_INSTANCE_NAME/ca_admin_cert.p12 +CA_ADMIN_CERT_P12=/root/.dogtag/$CA_INSTANCE_NAME/ca_admin_cert.p12 if [ -e $CA_ADMIN_CERT_P12 ] then @@ -64,7 +64,7 @@ fi # Importing KRA admin certificate ################################################################################ -KRA_ADMIN_CERT_P12=/root/.pki/$KRA_INSTANCE_NAME/kra_admin_cert.p12 +KRA_ADMIN_CERT_P12=/root/.dogtag/$KRA_INSTANCE_NAME/kra_admin_cert.p12 if [ -e $KRA_ADMIN_CERT_P12 ] then @@ -77,7 +77,7 @@ fi # Importing OCSP admin certificate ################################################################################ -OCSP_ADMIN_CERT_P12=/root/.pki/$OCSP_INSTANCE_NAME/ocsp_admin_cert.p12 +OCSP_ADMIN_CERT_P12=/root/.dogtag/$OCSP_INSTANCE_NAME/ocsp_admin_cert.p12 if [ -e $OCSP_ADMIN_CERT_P12 ] then @@ -90,7 +90,7 @@ fi # Importing TKS admin certificate ################################################################################ -TKS_ADMIN_CERT_P12=/root/.pki/$TKS_INSTANCE_NAME/tks_admin_cert.p12 +TKS_ADMIN_CERT_P12=/root/.dogtag/$TKS_INSTANCE_NAME/tks_admin_cert.p12 if [ -e $TKS_ADMIN_CERT_P12 ] then diff --git a/scripts/kra-remove.sh b/scripts/kra-remove.sh index 1be662a..9a9ba46 100755 --- a/scripts/kra-remove.sh +++ b/scripts/kra-remove.sh @@ -3,4 +3,4 @@ SRC_DIR=`cd ../.. ; pwd` INSTANCE_NAME=kra-master -pkidestroy -v -s KRA -i $INSTANCE_NAME -u caadmin -W test +pkidestroy -v -s KRA -i $INSTANCE_NAME -u caadmin -W password diff --git a/scripts/kra.cfg b/scripts/kra.cfg index 4cfe052..24c10c7 100644 --- a/scripts/kra.cfg +++ b/scripts/kra.cfg @@ -1,5 +1,6 @@ [DEFAULT] pki_instance_name=kra-master +#pki_skip_configuration=True [KRA] pki_ajp_port=12009 diff --git a/scripts/password b/scripts/password new file mode 100644 index 0000000..c9acae3 --- /dev/null +++ b/scripts/password @@ -0,0 +1 @@ +Secret123 diff --git a/scripts/ra-configure.sh b/scripts/ra-configure.sh index 1a4e59a..1f94cbb 100755 --- a/scripts/ra-configure.sh +++ b/scripts/ra-configure.sh @@ -8,7 +8,11 @@ CERTS=$SRC_DIR/pki-dev/certs/ra rm -rf $CERTS mkdir -p $CERTS -PORT="$RA_NON_CLIENTAUTH_SECURE_PORT" +if [ "$RA_SECURE_PORT" == "" ]; then + PORT="$RA_ADMIN_SECURE_PORT" +else + PORT="$RA_SECURE_PORT" +fi pkisilent ConfigureRA \ -cs_hostname $HOSTNAME \ |