Cleaned up and reorganized the scripts.

18 files changed, 33 insertions, 29 deletions

diff --git a/scripts/ca-certs.sh b/scripts/ca-certs.sh
index 7e5ce68..4633ff2 100755
--- a/scripts/ca-certs.sh
+++ b/scripts/ca-certs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-INSTANCE_DIR=/var/lib/pki/ca-master
+INSTANCE_NAME=ca-master
 
-certutil -L -d $INSTANCE_DIR/alias
+certutil -L -d /var/lib/pki/$INSTANCE_NAME/alias
diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index 12a7d75..ac9896b 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-pkispawn -f ca-master.cfg -s CA -v
+pkispawn -f ca.cfg -s CA -v 2>&1 | tee build/ca-create.log
diff --git a/scripts/ca-remove.sh b/scripts/ca-remove.sh
index d29e313..1177995 100755
--- a/scripts/ca-remove.sh
+++ b/scripts/ca-remove.sh
@@ -3,4 +3,4 @@
 SRC_DIR=`cd ../.. ; pwd`
 INSTANCE_NAME=ca-master
 
-pkidestroy -s CA -i $INSTANCE_NAME
+pkidestroy -v -s CA -i $INSTANCE_NAME
diff --git a/scripts/ca-run.sh b/scripts/ca-run.sh
index 75603b1..6da71c2 100755
--- a/scripts/ca-run.sh
+++ b/scripts/ca-run.sh
@@ -1,3 +1,5 @@
 #!/bin/sh -x
 
-java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/ca-master -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/ca-master/temp -Djava.util.logging.config.file=/var/lib/pki/ca-master/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
+INSTANCE_NAME=ca-master
+
+java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/$INSTANCE_NAME -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/$INSTANCE_NAME/temp -Djava.util.logging.config.file=/var/lib/pki/$INSTANCE_NAME/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
diff --git a/scripts/ca-test.sh b/scripts/ca-test.sh
index 3ce6da9..7acb08f 100755
--- a/scripts/ca-test.sh
+++ b/scripts/ca-test.sh
@@ -3,7 +3,7 @@
 SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=ca-master
-CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/certs
+CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/ca/certs
 SERVER_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/alias
 CERT_NAME="caSigningCert cert-${INSTANCE_NAME}"
 
diff --git a/scripts/ca-master.cfg b/scripts/ca.cfg
index 7976aa7..04bcfc5 100644
--- a/scripts/ca-master.cfg
+++ b/scripts/ca.cfg
@@ -50,7 +50,7 @@ pki_client_database_purge=False
 pki_client_dir=
 pki_ds_base_dn=dc=ca,dc=example,dc=com
 pki_ds_bind_dn=cn=Directory Manager
-pki_ds_database=
+pki_ds_database=ca
 pki_ds_hostname=
 pki_ds_ldap_port=389
 pki_ds_ldaps_port=636
@@ -157,7 +157,6 @@ pki_ocsp_signing_token=
 pki_subordinate=False
 pki_subsystem=CA
 pki_subsystem_name=
-pki_war_file=ca.war
 ###############################################################################
 ##  'KRA' Data:                                                              ##
 ##                                                                           ##
@@ -182,7 +181,6 @@ pki_transport_nickname=
 pki_transport_signing_algorithm=SHA256withRSA
 pki_transport_subject_dn=
 pki_transport_token=
-pki_war_file=kra.war
 ###############################################################################
 ##  'OCSP' Data:                                                             ##
 ##                                                                           ##
@@ -200,7 +198,6 @@ pki_ocsp_signing_subject_dn=
 pki_ocsp_signing_token=
 pki_subsystem=OCSP
 pki_subsystem_name=
-pki_war_file=ocsp.war
 ###############################################################################
 ##  'RA' Data:                                                               ##
 ##                                                                           ##
@@ -220,7 +217,6 @@ pki_subsystem_name=
 [TKS]
 pki_subsystem=TKS
 pki_subsystem_name=
-pki_war_file=tks.war
 ###############################################################################
 ##  'TPS' Data:                                                              ##
 ##                                                                           ##
diff --git a/scripts/cert-request-approve.sh b/scripts/cert-request-approve.sh
index ea73e69..162c2ee 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/certs
+CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/ca/certs
 
 # Approve request as an agent
-pki -v -U https://localhost:8443/ca -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-approve "$INPUT"
+pki -v -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 60fb438..ba9bc34 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/certs
+CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/ca/certs
 
 # Review request as an agent
-pki -v -U https://localhost:8443/ca -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --output "$OUTPUT"
+pki -v -d $CLIENT_CERT_DIR -w Secret123 -n caadmin cert-request-review "$REQUEST_ID" --output "$OUTPUT"
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index f4b4de0..f5ad86a 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -4,15 +4,21 @@ yum erase -y\
 	pki-symkey\
 	pki-base\
 	pki-tools\
+	pki-util\
 	pki-util-javadoc\
+	pki-common\
 	pki-common-javadoc\
+	pki-native-tools\
+	pki-java-tools\
 	pki-java-tools-javadoc\
 	pki-silent\
 	pki-selinux\
+	pki-deploy\
 	pki-server\
 	pki-setup\
 	pki-ca\
 	pki-kra\
 	pki-ocsp\
 	pki-tks\
+	pki-javadoc\
 	pki-core-debuginfo
diff --git a/scripts/firefox-certs-import.sh b/scripts/firefox-certs-import.sh
index 0ea1984..59119cb 100755
--- a/scripts/firefox-certs-import.sh
+++ b/scripts/firefox-certs-import.sh
@@ -11,7 +11,6 @@ fi
 echo HOME=$home
 
 SRC_DIR=`cd ../.. ; pwd`
-CERTS=$SRC_DIR/certs
 
 FIREFOX_DIR=$home/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
@@ -19,6 +18,8 @@ PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 CA_INSTANCE_NAME=ca-master
 KRA_INSTANCE_NAME=kra-master
 
+CERTS=/var/lib/pki/$CA_INSTANCE_NAME/ca/certs
+
 ################################################################################
 # Importing CA certificate
 ################################################################################
diff --git a/scripts/firefox-certs-remove.sh b/scripts/firefox-certs-remove.sh
index 71a6630..553f32f 100755
--- a/scripts/firefox-certs-remove.sh
+++ b/scripts/firefox-certs-remove.sh
@@ -8,6 +8,7 @@ else
     home=/home/$user
 fi
 
+CA_INSTANCE_NAME=ca-master
 FIREFOX_DIR=$home/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 
@@ -16,7 +17,7 @@ cd $FIREFOX_DIR/$PROFILE
 certutil -D -n "admin" -d .
 certutil -D -n "caadmin" -d .
 certutil -D -n "kraadmin" -d .
-certutil -D -n "caSigningCert cert-ca-master" -d .
+certutil -D -n "caSigningCert cert-$CA_INSTANCE_NAME" -d .
 certutil -D -n "$HOSTNAME" -d .
 certutil -D -n "$HOSTNAME #2" -d .
 certutil -D -n "$HOSTNAME #3" -d .
diff --git a/scripts/kra-certs.sh b/scripts/kra-certs.sh
index e443b22..91fa3a2 100755
--- a/scripts/kra-certs.sh
+++ b/scripts/kra-certs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
-INSTANCE_DIR=/var/lib/pki/kra-master
+INSTANCE_NAME=kra-master
 
-certutil -L -d $INSTANCE_DIR/alias
+certutil -L -d /var/lib/pki/$INSTANCE_NAME/alias
diff --git a/scripts/kra-create.sh b/scripts/kra-create.sh
index 7bd0686..e84ac01 100755
--- a/scripts/kra-create.sh
+++ b/scripts/kra-create.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-pkispawn -f kra-master.cfg -s KRA -v
+pkispawn -f kra.cfg -s KRA -v 2>&1 | tee build/kra-create.log
diff --git a/scripts/drm-java-test.sh b/scripts/kra-java-test.sh
index 37244c2..148046f 100755
--- a/scripts/drm-java-test.sh
+++ b/scripts/kra-java-test.sh
@@ -3,7 +3,7 @@
 SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=kra-master
-CLIENT_CERT_DIR=$SRC_DIR/certs/$INSTANCE_NAME
+CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/kra/certs
 
 CLASSPATH=$SRC_DIR/pki/build/classes
 CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-cli.jar
diff --git a/scripts/drm-python-test.sh b/scripts/kra-python-test.sh
index 873d5d9..403ce26 100755
--- a/scripts/drm-python-test.sh
+++ b/scripts/kra-python-test.sh
@@ -3,8 +3,8 @@
 SRC_DIR=`cd ../.. ; pwd`
 
 INSTANCE_NAME=kra-master
-CLIENT_CERT_DIR=$SRC_DIR/certs/$INSTANCE_NAME
 SERVER_CERT_DIR=/var/lib/pki/$INSTANCE_NAME
+CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/kra/certs
 CERT_NAME="transportCert cert-$INSTANCE_NAME"
 
 CLASSPATH=$SRC_DIR/pki/build/classes
diff --git a/scripts/kra-remove.sh b/scripts/kra-remove.sh
index b865456..c639ae3 100755
--- a/scripts/kra-remove.sh
+++ b/scripts/kra-remove.sh
@@ -3,4 +3,4 @@
 SRC_DIR=`cd ../.. ; pwd`
 INSTANCE_NAME=kra-master
 
-pkidestroy -s KRA -i $INSTANCE_NAME
+pkidestroy -v -s KRA -i $INSTANCE_NAME
diff --git a/scripts/kra-run.sh b/scripts/kra-run.sh
index a83b102..b02a984 100755
--- a/scripts/kra-run.sh
+++ b/scripts/kra-run.sh
@@ -1,3 +1,5 @@
 #!/bin/sh -x
 
-java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/kra-master -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/kra-master/temp -Djava.util.logging.config.file=/var/lib/pki/kra-master/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
+INSTANCE_NAME=kra-master
+
+java -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n -classpath :/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:/usr/share/java/commons-daemon.jar -Dcatalina.base=/var/lib/pki/$INSTANCE_NAME -Dcatalina.home=/usr/share/tomcat -Djava.endorsed.dirs= -Djava.io.tmpdir=/var/lib/pki/$INSTANCE_NAME/temp -Djava.util.logging.config.file=/var/lib/pki/$INSTANCE_NAME/conf/logging.properties -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager org.apache.catalina.startup.Bootstrap start
diff --git a/scripts/kra-master.cfg b/scripts/kra.cfg
index 6d41da9..5c8d7cf 100644
--- a/scripts/kra-master.cfg
+++ b/scripts/kra.cfg
@@ -50,7 +50,7 @@ pki_client_database_purge=False
 pki_client_dir=
 pki_ds_base_dn=dc=kra,dc=example,dc=com
 pki_ds_bind_dn=cn=Directory Manager
-pki_ds_database=
+pki_ds_database=kra
 pki_ds_hostname=
 pki_ds_ldap_port=389
 pki_ds_ldaps_port=636
@@ -157,7 +157,6 @@ pki_ocsp_signing_token=
 pki_subordinate=False
 pki_subsystem=CA
 pki_subsystem_name=
-pki_war_file=ca.war
 ###############################################################################
 ##  'KRA' Data:                                                              ##
 ##                                                                           ##
@@ -182,7 +181,6 @@ pki_transport_nickname=
 pki_transport_signing_algorithm=SHA256withRSA
 pki_transport_subject_dn=
 pki_transport_token=
-pki_war_file=kra.war
 ###############################################################################
 ##  'OCSP' Data:                                                             ##
 ##                                                                           ##
@@ -200,7 +198,6 @@ pki_ocsp_signing_subject_dn=
 pki_ocsp_signing_token=
 pki_subsystem=OCSP
 pki_subsystem_name=
-pki_war_file=ocsp.war
 ###############################################################################
 ##  'RA' Data:                                                               ##
 ##                                                                           ##
@@ -220,7 +217,6 @@ pki_subsystem_name=
 [TKS]
 pki_subsystem=TKS
 pki_subsystem_name=
-pki_war_file=tks.war
 ###############################################################################
 ##  'TPS' Data:                                                              ##
 ##                                                                           ##