Added TPS scripts.

10 files changed, 92 insertions, 22 deletions

diff --git a/scripts/cert-request-approve.sh b/scripts/cert-request-approve.sh
index 78b3189..80768ac 100755
--- a/scripts/cert-request-approve.sh
+++ b/scripts/cert-request-approve.sh
@@ -7,4 +7,4 @@ INSTANCE_NAME=ca-master
 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
+pki -d $CLIENT_CERT_DIR -c Secret123 -n caadmin cert-request-review "$REQUEST_ID" --action approve
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index 29e75c0..48ff2ad 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -12,5 +12,6 @@ yum erase -y\
 	pki-kra\
 	pki-ocsp\
 	pki-tks\
+	pki-tps\
 	pki-javadoc\
 	pki-core-debuginfo
diff --git a/scripts/nuke.sh b/scripts/nuke.sh
index b2949ba..8cd82f4 100755
--- a/scripts/nuke.sh
+++ b/scripts/nuke.sh
@@ -16,3 +16,4 @@ rm -rf /etc/sysconfig/$INSTANCE_NAME
 rm -rf /etc/sysconfig/pki/tomcat/$INSTANCE_NAME
 rm -rf /var/lib/pki/$INSTANCE_NAME
 rm -rf /var/log/pki/$INSTANCE_NAME
+rm -rf $HOME/.dogtag/$INSTANCE_NAME
diff --git a/scripts/tps-create.sh b/scripts/tps-create.sh
index 24e444c..ed88bad 100755
--- a/scripts/tps-create.sh
+++ b/scripts/tps-create.sh
@@ -1,15 +1,17 @@
 #!/bin/sh -x
 
-. ./tps-include.sh
+pkispawn -f tps.cfg -s TPS -v 2>&1 | tee build/tps-create.log
 
-pkicreate -pki_instance_root=$INSTANCE_ROOT             \
-             -pki_instance_name=$TPS_INSTANCE_NAME      \
-             -subsystem_type=$TPS_SUBSYSTEM_TYPE        \
-             -secure_port=$TPS_SECURE_PORT              \
-             -non_clientauth_secure_port=$TPS_NON_CLIENTAUTH_SECURE_PORT \
-             -unsecure_port=$TPS_UNSECURE_PORT          \
-             -user=$INSTANCE_USER                       \
-             -group=$INSTANCE_GROUP                     \
-             -redirect conf=/etc/$TPS_INSTANCE_NAME     \
-             -redirect logs=/var/log/$TPS_INSTANCE_NAME \
-             -verbose
+#. ./tps-include.sh
+
+#pkicreate -pki_instance_root=$INSTANCE_ROOT             \
+#             -pki_instance_name=$TPS_INSTANCE_NAME      \
+#             -subsystem_type=$TPS_SUBSYSTEM_TYPE        \
+#             -secure_port=$TPS_SECURE_PORT              \
+#             -non_clientauth_secure_port=$TPS_NON_CLIENTAUTH_SECURE_PORT \
+#             -unsecure_port=$TPS_UNSECURE_PORT          \
+#             -user=$INSTANCE_USER                       \
+#             -group=$INSTANCE_GROUP                     \
+#             -redirect conf=/etc/$TPS_INSTANCE_NAME     \
+#             -redirect logs=/var/log/$TPS_INSTANCE_NAME \
+#             -verbose
diff --git a/scripts/tps-format.sh b/scripts/tps-format.sh
new file mode 100755
index 0000000..d194593
--- /dev/null
+++ b/scripts/tps-format.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+tpsclient <<EOF
+op=var_set name=ra_host value=localhost
+op=var_set name=ra_port value=14080
+op=var_set name=ra_uri value=/tps/test
+op=var_list
+
+op=token_status
+
+op=token_set cuid=a00192030405060708c9 app_ver=6FBBC105 key_info=0101
+op=token_set auth_key=404142434445464748494a4b4c4d4e4f
+op=token_set mac_key=404142434445464748494a4b4c4d4e4f
+op=token_set kek_key=404142434445464748494a4b4c4d4e4f
+op=token_status
+
+op=ra_format uid=test pwd=password num_threads=1 new_pin=password
+
+op=token_status
+op=exit
+EOF
diff --git a/scripts/tps-nuke.sh b/scripts/tps-nuke.sh
new file mode 100755
index 0000000..78be679
--- /dev/null
+++ b/scripts/tps-nuke.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -x
+
+INSTANCE_NAME=tps-master
+
+./nuke.sh $INSTANCE_NAME
diff --git a/scripts/tps-remove.sh b/scripts/tps-remove.sh
index 8d6848d..62432bb 100755
--- a/scripts/tps-remove.sh
+++ b/scripts/tps-remove.sh
@@ -1,8 +1,13 @@
 #!/bin/sh -x
 
-. ./tps-include.sh
+SRC_DIR=`cd ../.. ; pwd`
+INSTANCE_NAME=tps-master
 
-pkiremove -pki_instance_root=$INSTANCE_ROOT     \
-          -pki_instance_name=$TPS_INSTANCE_NAME \
-          -force                                \
-          -verbose
+pkidestroy -v -s TPS -i $INSTANCE_NAME
+
+#. ./tps-include.sh
+
+#pkiremove -pki_instance_root=$INSTANCE_ROOT     \
+#          -pki_instance_name=$TPS_INSTANCE_NAME \
+#          -force                                \
+#          -verbose
diff --git a/scripts/tps-start.sh b/scripts/tps-start.sh
index 374cf10..16cd506 100755
--- a/scripts/tps-start.sh
+++ b/scripts/tps-start.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -x
 
-INSTANCE_NAME=pki-tps
+INSTANCE_NAME=tps-master
 
-systemctl start pki-tpsd@$INSTANCE_NAME.service
+systemctl start pki-tomcatd@$INSTANCE_NAME.service
+
+#INSTANCE_NAME=pki-tps
+
+#systemctl start pki-tpsd@$INSTANCE_NAME.service
diff --git a/scripts/tps-stop.sh b/scripts/tps-stop.sh
index 0f9696f..d3eba4a 100755
--- a/scripts/tps-stop.sh
+++ b/scripts/tps-stop.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -x
 
-INSTANCE_NAME=pki-tps
+INSTANCE_NAME=tps-master
 
-systemctl stop pki-tpsd@$INSTANCE_NAME.service
+systemctl stop pki-tomcatd@$INSTANCE_NAME.service
+
+#INSTANCE_NAME=pki-tps
+
+#systemctl stop pki-tpsd@$INSTANCE_NAME.service
diff --git a/scripts/tps.cfg b/scripts/tps.cfg
new file mode 100644
index 0000000..f0fa757
--- /dev/null
+++ b/scripts/tps.cfg
@@ -0,0 +1,27 @@
+[DEFAULT]
+pki_instance_name=tps-master
+#pki_skip_configuration=True
+
+[TPS]
+pki_ajp_port=16009
+pki_admin_cert_file=/root/.dogtag/ca-master/ca_admin.cert
+pki_admin_email=tpsadmin@example.com
+pki_admin_name=tpsadmin
+pki_admin_nickname=tpsadmin
+pki_admin_password=Secret123
+pki_admin_uid=tpsadmin
+pki_backup_password=Secret123
+pki_ds_base_dn=dc=tps,dc=example,dc=com
+pki_ds_database=tps
+pki_client_database_password=Secret123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret123
+pki_clone_pkcs12_password=Secret123
+pki_ds_password=Secret123
+pki_http_port=16080
+pki_https_port=16443
+pki_security_domain_name=EXAMPLE
+pki_security_domain_user=caadmin
+pki_security_domain_password=Secret123
+pki_token_password=Secret123
+pki_tomcat_server_port=16005