From 19167cfa92bf26a2222f5f39d191a82e8bf48443 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Sat, 23 Feb 2013 22:24:43 -0600
Subject: Fixed Firefox script.

---
 scripts/firefox-certs-import.sh | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'scripts/firefox-certs-import.sh')

diff --git a/scripts/firefox-certs-import.sh b/scripts/firefox-certs-import.sh
index 4e5a89b..26b76be 100755
--- a/scripts/firefox-certs-import.sh
+++ b/scripts/firefox-certs-import.sh
@@ -51,12 +51,12 @@ certutil -A -d $FIREFOX_DIR/$PROFILE -n "$SERVER_CERT_NAME" -i $CA_CERT_DIR/serv
 # Importing CA admin certificate
 ################################################################################
 
-CA_CERT_P12=$CA_CERT_DIR/ca_admin_cert.p12
+CA_ADMIN_CERT_P12=/root/.pki/$CA_INSTANCE_NAME/ca_admin_cert.p12
 
-if [ -e $CA_CERT_P12 ]
+if [ -e $CA_ADMIN_CERT_P12 ]
 then
     echo Importing CA admin certificate...
-    pk12util -i $CA_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+    pk12util -i $CA_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
     certutil -M -n caadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
 fi
 
@@ -64,13 +64,12 @@ fi
 # Importing KRA admin certificate
 ################################################################################
 
-KRA_CERT_DIR=/var/lib/pki/$KRA_INSTANCE_NAME/alias
-KRA_CERT_P12=$KRA_CERT_DIR/kra_admin_cert.p12
+KRA_ADMIN_CERT_P12=/root/.pki/$KRA_INSTANCE_NAME/kra_admin_cert.p12
 
-if [ -e $KRA_CERT_P12 ]
+if [ -e $KRA_ADMIN_CERT_P12 ]
 then
     echo Importing KRA admin certificate...
-    pk12util -i $KRA_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+    pk12util -i $KRA_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
     certutil -M -n kraadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
 fi
 
@@ -78,13 +77,12 @@ fi
 # Importing OCSP admin certificate
 ################################################################################
 
-OCSP_CERT_DIR=/var/lib/pki/$OCSP_INSTANCE_NAME/alias
-OCSP_CERT_P12=$OCSP_CERT_DIR/ocsp_admin_cert.p12
+OCSP_ADMIN_CERT_P12=/root/.pki/$OCSP_INSTANCE_NAME/ocsp_admin_cert.p12
 
-if [ -e $OCSP_CERT_P12 ]
+if [ -e $OCSP_ADMIN_CERT_P12 ]
 then
     echo Importing OCSP admin certificate...
-    pk12util -i $OCSP_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+    pk12util -i $OCSP_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
     certutil -M -n ocspadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
 fi
 
@@ -92,12 +90,11 @@ fi
 # Importing TKS admin certificate
 ################################################################################
 
-TKS_CERT_DIR=/var/lib/pki/$TKS_INSTANCE_NAME/alias
-TKS_CERT_P12=$TKS_CERT_DIR/tks_admin_cert.p12
+TKS_ADMIN_CERT_P12=/root/.pki/$TKS_INSTANCE_NAME/tks_admin_cert.p12
 
-if [ -e $TKS_CERT_P12 ]
+if [ -e $TKS_ADMIN_CERT_P12 ]
 then
     echo Importing TKS admin certificate...
-    pk12util -i $TKS_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+    pk12util -i $TKS_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
     certutil -M -n tksadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
 fi
-- 
cgit