Added support for shared & separate ports.

9 files changed, 62 insertions, 34 deletions

diff --git a/scripts/ca-configure.sh b/scripts/ca-configure.sh
index 8b67093..e2c2110 100755
--- a/scripts/ca-configure.sh
+++ b/scripts/ca-configure.sh
@@ -8,9 +8,15 @@ CERTS=$SRC_DIR/pki-dev/certs/ca
 rm -rf $CERTS
 mkdir -p $CERTS
 
+if [ "$CA_SECURE_PORT" == "" ]; then
+    PORT="$CA_ADMIN_SECURE_PORT"
+else
+    PORT="$CA_SECURE_PORT"
+fi
+
 pkisilent ConfigureCA \
         -cs_hostname $HOSTNAME \
-        -cs_port $CA_SECURE_PORT \
+        -cs_port $PORT \
         -preop_pin $PIN \
         -client_certdb_dir "$CERTS" \
         -client_certdb_pwd "$PASSWORD" \
diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index 0afe23f..caac7ca 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -2,11 +2,30 @@
 
 . ./ca-include.sh
 
-pkicreate -pki_instance_root=$INSTANCE_ROOT		\
+if [ "$CA_SECURE_PORT" == "" ]; then
+
+    pkicreate -pki_instance_root=$INSTANCE_ROOT		\
+          -pki_instance_name=$CA_INSTANCE_NAME		\
+          -subsystem_type=$CA_SUBSYSTEM_TYPE		\
+          -agent_secure_port=$CA_AGENT_SECURE_PORT	\
+          -ee_secure_port=$CA_EE_SECURE_PORT		\
+          -ee_secure_client_auth_port=$CA_EE_SECURE_CLIENT_AUTH_PORT	\
+          -admin_secure_port=$CA_ADMIN_SECURE_PORT	\
+          -unsecure_port=$CA_UNSECURE_PORT		\
+          -tomcat_server_port=$CA_TOMCAT_SERVER_PORT	\
+          -user=$INSTANCE_USER				\
+          -group=$INSTANCE_GROUP			\
+          -redirect conf=/etc/$CA_INSTANCE_NAME		\
+          -redirect logs=/var/log/$CA_INSTANCE_NAME	\
+          -verbose
+
+else
+
+    pkicreate -pki_instance_root=$INSTANCE_ROOT		\
           -pki_instance_name=$CA_INSTANCE_NAME		\
           -subsystem_type=$CA_SUBSYSTEM_TYPE		\
           -secure_port=$CA_SECURE_PORT			\
-          -unsecure_port=$CA_UNSECURE_PORT			\
+          -unsecure_port=$CA_UNSECURE_PORT		\
           -tomcat_server_port=$CA_TOMCAT_SERVER_PORT	\
           -user=$INSTANCE_USER				\
           -group=$INSTANCE_GROUP			\
@@ -14,12 +33,16 @@ pkicreate -pki_instance_root=$INSTANCE_ROOT		\
           -redirect logs=/var/log/$CA_INSTANCE_NAME	\
           -verbose
 
-ln -s /usr/share/tomcat6/bin $INSTANCE_ROOT/$CA_INSTANCE_NAME/bin
-ln -s /usr/share/tomcat6/lib $INSTANCE_ROOT/$CA_INSTANCE_NAME/lib
-rm -f $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/lib/pki-*
+fi
+
+cd $INSTANCE_ROOT/$CA_INSTANCE_NAME
+
+ln -s /usr/share/tomcat6/bin bin
+ln -s /usr/share/tomcat6/lib lib
+rm -f webapps/ca/WEB-INF/lib/pki-*
 
-rm -rf $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/classes
-cp -r $SRC_DIR/pki/build/classes $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF
-chown -R $INSTANCE_USER.$INSTANCE_GROUP $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/classes
+rm -rf webapps/ca/WEB-INF/classes
+cp -r $SRC_DIR/pki/build/classes webapps/ca/WEB-INF
+chown -R $INSTANCE_USER.$INSTANCE_GROUP webapps/ca/WEB-INF/classes
 
 systemctl restart pki-cad@$CA_INSTANCE_NAME.service
diff --git a/scripts/ca-include.sh b/scripts/ca-include.sh
index 20e2c67..8d2c454 100755
--- a/scripts/ca-include.sh
+++ b/scripts/ca-include.sh
@@ -16,6 +16,10 @@ CA_SUBSYSTEM_TYPE="ca"
 CA_SUBSYSTEM_NAME="Certificate Authority"
 
 CA_SECURE_PORT="9443"
+CA_AGENT_SECURE_PORT="9443"
+CA_EE_SECURE_PORT="9444"
+CA_ADMIN_SECURE_PORT="9445"
+CA_EE_SECURE_CLIENT_AUTH_PORT="9446"
 CA_UNSECURE_PORT="9180"
 CA_TOMCAT_SERVER_PORT="9701"
 
diff --git a/scripts/console-uninstall.sh b/scripts/console-uninstall.sh
index 8e74e0a..6c54656 100755
--- a/scripts/console-uninstall.sh
+++ b/scripts/console-uninstall.sh
@@ -1,3 +1,4 @@
 #!/bin/sh -x
 
-rpm -ev --nodeps pki-console
+yum erase -y\
+	pki-console
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index 50f89f4..91296c2 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -1,14 +1,10 @@
 #!/bin/sh -x
 
-rpm -ev --nodeps\
-	pki-core-debuginfo
-
-rpm -ev --nodeps\
+yum erase -y\
+	pki-core-debuginfo\
 	pki-util-javadoc\
 	pki-common-javadoc\
-	pki-java-tools-javadoc
-
-rpm -ev --nodeps\
+	pki-java-tools-javadoc\
 	pki-selinux\
 	pki-tks\
 	pki-kra\
@@ -20,7 +16,5 @@ rpm -ev --nodeps\
 	pki-ocsp\
 	pki-ca\
 	pki-java-tools\
-	pki-symkey
-
-rpm -ev --nodeps\
-	pki-deploy
+	pki-symkey\
+	pki-deploy\
diff --git a/scripts/ds-uninstall.sh b/scripts/ds-uninstall.sh
index 7ff4a0d..25d54e2 100755
--- a/scripts/ds-uninstall.sh
+++ b/scripts/ds-uninstall.sh
@@ -1,9 +1,7 @@
 #!/bin/sh -x
 
-rpm -ev --nodeps\
-	389-ds-base-devel
-
-rpm -ev --nodeps\
+yum erase -y\
+	389-ds-base-devel\
 	389-ds-base\
  	389-adminutil\
  	389-admin-console\
diff --git a/scripts/kra-create.sh b/scripts/kra-create.sh
index 8d7b780..3789c11 100755
--- a/scripts/kra-create.sh
+++ b/scripts/kra-create.sh
@@ -17,12 +17,14 @@ pkicreate -pki_instance_root=/var/lib			\
           -redirect logs=/var/log/$INSTANCE_NAME	\
           -verbose
 
-ln -s /usr/share/tomcat6/bin /var/lib/$INSTANCE_NAME/bin
-ln -s /usr/share/tomcat6/lib /var/lib/$INSTANCE_NAME/lib
-rm -f /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/lib/pki-*
+cd /var/lib/$INSTANCE_NAME
 
-rm -rf /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/classes
-cp -r $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF
-chown -R pkiuser.pkiuser /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/classes
+ln -s /usr/share/tomcat6/bin bin
+ln -s /usr/share/tomcat6/lib lib
+rm -f webapps/kra/WEB-INF/lib/pki-*
+
+rm -rf webapps/kra/WEB-INF/classes
+cp -r $SRC_DIR/pki/build/classes webapps/kra/WEB-INF
+chown -R pkiuser.pkiuser webapps/kra/WEB-INF/classes
 
 systemctl restart pki-krad@$INSTANCE_NAME.service
diff --git a/scripts/tet.sh b/scripts/tet.sh
index f780f5a..0bd5f4f 100755
--- a/scripts/tet.sh
+++ b/scripts/tet.sh
@@ -4,6 +4,6 @@ SRC_DIR=`cd ../.. ; pwd`
 TET_DIR=$SRC_DIR/tet
 
 cd $TET_DIR
-mkdir logs
+mkdir -p logs
 
-testframework/utils/tet_shared/launch.sh $TET_DIR/testframework | tee logs/tet.log
+testframework/utils/tet_shared/launch.sh $TET_DIR/testframework 2>&1 | tee logs/tet.log
diff --git a/scripts/theme-uninstall.sh b/scripts/theme-uninstall.sh
index 590ad49..8f714d8 100755
--- a/scripts/theme-uninstall.sh
+++ b/scripts/theme-uninstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-rpm -ev --nodeps\
+yum erase -y\
 	dogtag-pki-ca-theme\
 	dogtag-pki-kra-theme\
 	dogtag-pki-tps-theme\