Updated Firefox scripts.

2 files changed, 10 insertions, 63 deletions

diff --git a/scripts/firefox-certs-import.sh b/scripts/firefox-certs-import.sh
index 69031d3..d1d35aa 100755
--- a/scripts/firefox-certs-import.sh
+++ b/scripts/firefox-certs-import.sh
@@ -16,17 +16,14 @@ FIREFOX_DIR=$home/.mozilla/firefox
 #PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 PROFILE=$HOSTNAME
 
-CA_INSTANCE_NAME=pki-tomcat
-KRA_INSTANCE_NAME=pki-tomcat
-OCSP_INSTANCE_NAME=pki-tomcat
-TKS_INSTANCE_NAME=pki-tomcat
+INSTANCE_NAME=pki-tomcat
 
 ################################################################################
 # Importing CA certificate
 ################################################################################
 
-CA_CERT_NAME="caSigningCert cert-$CA_INSTANCE_NAME CA"
-CA_CERT_DIR=/var/lib/pki/$CA_INSTANCE_NAME/alias
+CA_CERT_NAME="ca_signing"
+CA_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/alias
 
 echo Exporting CA certificate...
 certutil -L -d $CA_CERT_DIR -n "$CA_CERT_NAME" -a > $CA_CERT_DIR/ca.pem
@@ -39,7 +36,7 @@ certutil -A -d $FIREFOX_DIR/$PROFILE -n "$CA_CERT_NAME" -i $CA_CERT_DIR/ca.pem -
 # Importing server certificate
 ################################################################################
 
-SERVER_CERT_NAME="Server-Cert cert-$CA_INSTANCE_NAME"
+SERVER_CERT_NAME="sslserver"
 
 echo Exporting server certificate...
 certutil -L -d $CA_CERT_DIR -n "$SERVER_CERT_NAME" -a > $CA_CERT_DIR/server.pem
@@ -52,50 +49,11 @@ certutil -A -d $FIREFOX_DIR/$PROFILE -n "$SERVER_CERT_NAME" -i $CA_CERT_DIR/serv
 # Importing CA admin certificate
 ################################################################################
 
-CA_ADMIN_CERT_P12=/root/.dogtag/$CA_INSTANCE_NAME/ca_admin_cert.p12
+CA_ADMIN_CERT_P12=/root/.dogtag/$INSTANCE_NAME/ca_admin_cert.p12
 
 if [ -e $CA_ADMIN_CERT_P12 ]
 then
     echo Importing CA admin certificate...
-    pk12util -i $CA_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+    pk12util -i $CA_ADMIN_CERT_P12 -d $FIREFOX_DIR/$PROFILE -W Secret.123
     certutil -M -n caadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
 fi
-
-################################################################################
-# Importing KRA admin certificate
-################################################################################
-
-KRA_ADMIN_CERT_P12=/root/.dogtag/$KRA_INSTANCE_NAME/kra_admin_cert.p12
-
-if [ -e $KRA_ADMIN_CERT_P12 ]
-then
-    echo Importing KRA admin certificate...
-    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
-
-################################################################################
-# Importing OCSP admin certificate
-################################################################################
-
-OCSP_ADMIN_CERT_P12=/root/.dogtag/$OCSP_INSTANCE_NAME/ocsp_admin_cert.p12
-
-if [ -e $OCSP_ADMIN_CERT_P12 ]
-then
-    echo Importing OCSP admin certificate...
-    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
-
-################################################################################
-# Importing TKS admin certificate
-################################################################################
-
-TKS_ADMIN_CERT_P12=/root/.dogtag/$TKS_INSTANCE_NAME/tks_admin_cert.p12
-
-if [ -e $TKS_ADMIN_CERT_P12 ]
-then
-    echo Importing TKS admin certificate...
-    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
diff --git a/scripts/firefox-certs-remove.sh b/scripts/firefox-certs-remove.sh
index 63f067b..52cc162 100755
--- a/scripts/firefox-certs-remove.sh
+++ b/scripts/firefox-certs-remove.sh
@@ -16,23 +16,12 @@ PROFILE=$HOSTNAME
 echo cd $FIREFOX_DIR/$PROFILE
 cd $FIREFOX_DIR/$PROFILE
 
-certutil -D -n "admin" -d .
 certutil -D -n "caadmin" -d .
+certutil -D -n "caagent" -d .
 certutil -D -n "kraadmin" -d .
 certutil -D -n "kraagent" -d .
 certutil -D -n "ocspadmin" -d .
 certutil -D -n "tksadmin" -d .
-certutil -D -n "Server-Cert cert-$CA_INSTANCE_NAME" -d .
-certutil -D -n "caSigningCert cert-$CA_INSTANCE_NAME CA" -d .
-certutil -D -n "TPS Administrator of Instance pki-tomcat's EXAMPLE ID" -d .
-certutil -D -n "CA Administrator of Instance pki-tomcat's IdmLabBosRedhat Domain ID" -d .
-certutil -D -n "RA Administrator's EXAMPLE ID" -d .
-certutil -D -n "Certificate Authority - IdmLabBosRedhat Domain" -d .
-certutil -D -n "$HOSTNAME" -d .
-certutil -D -n "$HOSTNAME #2" -d .
-certutil -D -n "$HOSTNAME #3" -d .
-certutil -D -n "$HOSTNAME #4" -d .
-certutil -D -n "$HOSTNAME #5" -d .
-certutil -D -n "$HOSTNAME #6" -d .
-certutil -D -n "$HOSTNAME #7" -d .
-certutil -D -n "$HOSTNAME #8" -d .
+certutil -D -n "tpsadmin" -d .
+certutil -D -n "sslserver" -d .
+certutil -D -n "ca_signing" -d .