Added new TPS scripts.

13 files changed, 59 insertions, 17 deletions

diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index afa0e31..42b4105 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -1,3 +1,4 @@
 #!/bin/sh -x
 
+mkdir -p build
 pkispawn -v -f ca.cfg -s CA 2>&1 | tee build/ca-create.log
diff --git a/scripts/console-build.sh b/scripts/console-build.sh
index 28d036f..f91eff0 100755
--- a/scripts/console-build.sh
+++ b/scripts/console-build.sh
@@ -1,21 +1,19 @@
 #!/bin/sh -x
 
-WORK_DIR=`pwd`
 PROJECT_DIR=`cd ../.. ; pwd`
-COMPONENT=console
 
-mkdir -p $WORK_DIR/build
-rm -rf $WORK_DIR/build/$COMPONENT
+BUILD_DIR=$HOME/build/pki-console
+COMPOSE=$PROJECT_DIR/pki/scripts/compose_pki_console_packages
 
-cd $PROJECT_DIR
-rm -rf packages
-mkdir -p packages
+mkdir -p $BUILD_DIR
+cd $BUILD_DIR
 
-pki/scripts/compose_pki_${COMPONENT}_packages rpms | tee packages/build.log
+rm -rf rpmbuild
+mkdir -p rpmbuild
 
-mv packages $WORK_DIR/build/$COMPONENT
-cd $WORK_DIR/build/$COMPONENT
+$COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms 2>&1 | tee build.log
 
+rm -rf repo
 mkdir -p repo
-mv `find RPMS -name *.rpm` repo
+mv `find rpmbuild/RPMS -name *.rpm` repo
 createrepo repo
diff --git a/scripts/firefox-certs-import.sh b/scripts/firefox-certs-import.sh
index 07d44e0..33b83ec 100755
--- a/scripts/firefox-certs-import.sh
+++ b/scripts/firefox-certs-import.sh
@@ -15,10 +15,10 @@ SRC_DIR=`cd ../.. ; pwd`
 FIREFOX_DIR=$home/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 
-CA_INSTANCE_NAME=ca-master
-KRA_INSTANCE_NAME=kra-master
-OCSP_INSTANCE_NAME=ocsp-master
-TKS_INSTANCE_NAME=tks-master
+CA_INSTANCE_NAME=pki-tomcat
+KRA_INSTANCE_NAME=pki-tomcat
+OCSP_INSTANCE_NAME=pki-tomcat
+TKS_INSTANCE_NAME=pki-tomcat
 
 ################################################################################
 # Importing CA certificate
diff --git a/scripts/firefox-certs-remove.sh b/scripts/firefox-certs-remove.sh
index d532683..3b30874 100755
--- a/scripts/firefox-certs-remove.sh
+++ b/scripts/firefox-certs-remove.sh
@@ -8,10 +8,11 @@ else
     home=/home/$user
 fi
 
-CA_INSTANCE_NAME=ca-master
+CA_INSTANCE_NAME=pki-tomcat
 FIREFOX_DIR=$home/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 
+echo cd $FIREFOX_DIR/$PROFILE
 cd $FIREFOX_DIR/$PROFILE
 
 certutil -D -n "admin" -d .
diff --git a/scripts/jar-find.sh b/scripts/jar-find.sh
index cc42055..1dfbad2 100755
--- a/scripts/jar-find.sh
+++ b/scripts/jar-find.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if [ $# != 2 ]; then
+    echo "usage: jar-find <dir> <class>"
+    exit 1
+fi
+
 dir=$1
 
 shift
diff --git a/scripts/newtps-create.sh b/scripts/newtps-create.sh
new file mode 100755
index 0000000..caa6554
--- /dev/null
+++ b/scripts/newtps-create.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+pkispawn -f tps.cfg -s TPS -vvv 2>&1 | tee build/tps-create.log
diff --git a/scripts/newtps-debug.sh b/scripts/newtps-debug.sh
new file mode 100755
index 0000000..ce3e894
--- /dev/null
+++ b/scripts/newtps-debug.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -x
+
+INSTANCE_NAME=tps-master
+FILE=/etc/sysconfig/$INSTANCE_NAME
+
+# semanage port -a -t http_port_t -p tcp 8000
+sed 's/^#\(JAVA_OPTS="-Xdebug.*\)$/\1/' < $FILE > $FILE.tmp
+mv $FILE.tmp $FILE
diff --git a/scripts/newtps-remove.sh b/scripts/newtps-remove.sh
new file mode 100755
index 0000000..67c3892
--- /dev/null
+++ b/scripts/newtps-remove.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -x
+
+pkidestroy -v -s TPS -i pki-tomcat
+#pkidestroy -v -s TPS -i ca-master
+#pkidestroy -v -s TPS -i tps-master
diff --git a/scripts/newtps-restart.sh b/scripts/newtps-restart.sh
new file mode 100755
index 0000000..f92573e
--- /dev/null
+++ b/scripts/newtps-restart.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+./newtps-stop.sh
+./newtps-start.sh
diff --git a/scripts/newtps-start.sh b/scripts/newtps-start.sh
new file mode 100755
index 0000000..4a0d5f4
--- /dev/null
+++ b/scripts/newtps-start.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+INSTANCE_NAME=tps-master
+systemctl start pki-tomcatd@$INSTANCE_NAME.service
diff --git a/scripts/newtps-stop.sh b/scripts/newtps-stop.sh
new file mode 100755
index 0000000..9744794
--- /dev/null
+++ b/scripts/newtps-stop.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+INSTANCE_NAME=tps-master
+systemctl stop pki-tomcatd@$INSTANCE_NAME.service
diff --git a/scripts/newtps-update.sh b/scripts/newtps-update.sh
new file mode 100755
index 0000000..330e13b
--- /dev/null
+++ b/scripts/newtps-update.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/bin/cp ../../pki/base/server/share/webapps/pki/js/* /var/lib/pki/pki-tomcat/webapps/pki/js/
+/bin/cp ../../pki/base/tps-tomcat/shared/webapps/tps/*.html /var/lib/pki/pki-tomcat/webapps/tps/
+/bin/cp ../../pki/base/server/share/webapps/pki/css/* /var/lib/pki/pki-tomcat/webapps/pki/css/
+/bin/cp ../../pki/base/tps-tomcat/shared/webapps/tps/js/* /var/lib/pki/pki-tomcat/webapps/tps/js/
diff --git a/scripts/nuke.sh b/scripts/nuke.sh
index 8cd82f4..5a12858 100755
--- a/scripts/nuke.sh
+++ b/scripts/nuke.sh
@@ -9,7 +9,10 @@ fi
 
 echo "Deleting instance $INSTANCE_NAME"
 
-ps -ef | grep catalina.base=/var/lib/pki/$INSTANCE_NAME | grep -v grep | awk '{print $2}' | xargs kill -9
+pids="`ps -ef | grep catalina.base=/var/lib/pki/$INSTANCE_NAME | grep -v grep | awk '{print $2}'`"
+for pid in $pids; do
+    kill -9 $pid
+done
 
 rm -rf /etc/pki/$INSTANCE_NAME
 rm -rf /etc/sysconfig/$INSTANCE_NAME