Updated PKI scripts

7 files changed, 59 insertions, 23 deletions

diff --git a/scripts/pki-build.sh b/scripts/pki-build.sh
index b3c21f1..ea95e57 100755
--- a/scripts/pki-build.sh
+++ b/scripts/pki-build.sh
@@ -1,22 +1,5 @@
 #!/bin/sh -x
 
-./console-uninstall.sh
-./ra-uninstall.sh
-./tps-uninstall.sh
-./core-uninstall.sh
-./theme-uninstall.sh
+# ../../pki/build.sh --with-timestamp --with-commit-id --without-server --without-javadoc --without-test "$@"
 
-./theme-build.sh
-./theme-install.sh
-
-./core-build.sh
-./core-install.sh
-
-./tps-build.sh
-./tps-install.sh
-
-./ra-build.sh
-./ra-install.sh
-
-./console-build.sh
-./console-install.sh
+../../pki/build.sh --with-timestamp --with-commit-id "$@"
diff --git a/scripts/pki-downgrade.sh b/scripts/pki-downgrade.sh
new file mode 100755
index 0000000..850b052
--- /dev/null
+++ b/scripts/pki-downgrade.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+yum downgrade pki-base pki-symkey pki-tools pki-javadoc pki-server pki-ca pki-kra pki-ocsp pki-tks pki-tps
diff --git a/scripts/pki-install.sh b/scripts/pki-install.sh
new file mode 100755
index 0000000..72be39f
--- /dev/null
+++ b/scripts/pki-install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+dnf install -y `find $HOME/build/pki/RPMS -type f`
diff --git a/scripts/pki-nuke.sh b/scripts/pki-nuke.sh
index 8638018..cc8eb25 100755
--- a/scripts/pki-nuke.sh
+++ b/scripts/pki-nuke.sh
@@ -21,3 +21,10 @@ rm -rf /var/lib/pki/$INSTANCE_NAME
 rm -rf /var/log/pki/$INSTANCE_NAME
 rm -rf /var/log/pki/pki-*.log
 rm -rf $HOME/.dogtag/$INSTANCE_NAME
+
+if [ "$INSTANCE_NAME" != "pki-tomcat" ]; then
+    semanage fcontext -d "/etc/pki/$INSTANCE_NAME(/.*)?"
+    semanage fcontext -d "/etc/pki/$INSTANCE_NAME/alias(/.*)?"
+    semanage fcontext -d "/var/lib/pki/$INSTANCE_NAME(/.*)?"
+    semanage fcontext -d "/var/log/pki/$INSTANCE_NAME(/.*)?"
+fi
diff --git a/scripts/pki-pull.sh b/scripts/pki-pull.sh
new file mode 100755
index 0000000..3a09ca0
--- /dev/null
+++ b/scripts/pki-pull.sh
@@ -0,0 +1,6 @@
+#!/bin/sh -x
+
+SRC_DIR=`cd ../.. ; pwd`
+
+cd $SRC_DIR/pki
+git pull
diff --git a/scripts/pki-remove.sh b/scripts/pki-remove.sh
new file mode 100755
index 0000000..5d47cb2
--- /dev/null
+++ b/scripts/pki-remove.sh
@@ -0,0 +1,36 @@
+#!/bin/sh -x
+
+rpm -e --nodeps dogtag-pki
+
+rpm -e --nodeps dogtag-pki-server-theme
+rpm -e --nodeps dogtag-pki-console-theme
+
+rpm -e --nodeps pki-console
+
+rpm -e --nodeps pki-tps-debuginfo
+rpm -e --nodeps pki-core-debuginfo
+rpm -e --nodeps pki-core-debugsource
+rpm -e --nodeps pki-tools-debuginfo
+rpm -e --nodeps pki-symkey-debuginfo
+rpm -e --nodeps pki-debuginfo
+rpm -e --nodeps pki-debugsource
+
+rpm -e --nodeps pki-silent
+rpm -e --nodeps pki-base-python3
+
+rpm -e --nodeps pki-tps
+rpm -e --nodeps pki-tks
+rpm -e --nodeps pki-ocsp
+rpm -e --nodeps pki-kra
+rpm -e --nodeps pki-ca
+rpm -e --nodeps pki-server
+rpm -e --nodeps pki-util
+rpm -e --nodeps pki-selinux
+rpm -e --nodeps pki-javadoc
+
+rpm -e --nodeps pki-tools
+rpm -e --nodeps pki-base-java
+rpm -e --nodeps python2-pki
+rpm -e --nodeps python3-pki
+rpm -e --nodeps pki-base
+rpm -e --nodeps pki-symkey
diff --git a/scripts/pki-update.sh b/scripts/pki-update.sh
index 3a09ca0..94d4905 100755
--- a/scripts/pki-update.sh
+++ b/scripts/pki-update.sh
@@ -1,6 +1,4 @@
 #!/bin/sh -x
 
-SRC_DIR=`cd ../.. ; pwd`
-
-cd $SRC_DIR/pki
-git pull
+./pki-remove.sh
+./pki-install.sh