summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/ca-create.sh5
-rwxr-xr-xscripts/console-rebuild.sh3
-rwxr-xr-xscripts/console-reinstall.sh4
-rwxr-xr-xscripts/console-uninstall.sh2
-rwxr-xr-xscripts/core-rebuild.sh3
-rwxr-xr-xscripts/core-reinstall.sh4
-rwxr-xr-xscripts/core-uninstall.sh9
-rwxr-xr-xscripts/kra-create.sh5
-rwxr-xr-xscripts/theme-rebuild.sh6
-rwxr-xr-xscripts/theme-reinstall.sh4
-rwxr-xr-xscripts/theme-uninstall.sh3
11 files changed, 39 insertions, 9 deletions
diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index b909e19..87fd66b 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -19,7 +19,10 @@ pkicreate -pki_instance_root=/var/lib \
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/ca/WEB-INF/lib/pki-*
-ln -s $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
+
+rm -rf /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
+cp -r $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF
+chown -R pkiuser.pkiuser /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
systemctl restart pki-cad@$INSTANCE_NAME.service
diff --git a/scripts/console-rebuild.sh b/scripts/console-rebuild.sh
index 2464246..c111895 100755
--- a/scripts/console-rebuild.sh
+++ b/scripts/console-rebuild.sh
@@ -1,5 +1,6 @@
#!/bin/sh -x
-./console-uninstall.sh
./console-build.sh
+
+./console-uninstall.sh
./console-install.sh
diff --git a/scripts/console-reinstall.sh b/scripts/console-reinstall.sh
new file mode 100755
index 0000000..94deeff
--- /dev/null
+++ b/scripts/console-reinstall.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+./console-uninstall.sh
+./console-install.sh
diff --git a/scripts/console-uninstall.sh b/scripts/console-uninstall.sh
index 5504f19..8e74e0a 100755
--- a/scripts/console-uninstall.sh
+++ b/scripts/console-uninstall.sh
@@ -1,3 +1,3 @@
#!/bin/sh -x
-rpm -ev pki-console
+rpm -ev --nodeps pki-console
diff --git a/scripts/core-rebuild.sh b/scripts/core-rebuild.sh
index 28f3bb9..3c79a1d 100755
--- a/scripts/core-rebuild.sh
+++ b/scripts/core-rebuild.sh
@@ -1,5 +1,6 @@
#!/bin/sh -x
-./core-uninstall.sh
./core-build.sh
+
+./core-uninstall.sh
./core-install.sh
diff --git a/scripts/core-reinstall.sh b/scripts/core-reinstall.sh
new file mode 100755
index 0000000..1f13497
--- /dev/null
+++ b/scripts/core-reinstall.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+./core-uninstall.sh
+./core-install.sh
diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh
index b4e2852..cda9df5 100755
--- a/scripts/core-uninstall.sh
+++ b/scripts/core-uninstall.sh
@@ -1,12 +1,15 @@
#!/bin/sh -x
-rpm -ev pki-core-debuginfo
+rpm -ev --nodeps\
+ pki-core-debuginfo
-rpm -ev pki-util-javadoc\
+rpm -ev --nodeps\
+ pki-util-javadoc\
pki-common-javadoc\
pki-java-tools-javadoc
-rpm -ev pki-deploy\
+rpm -ev --nodeps\
+ pki-deploy\
pki-selinux\
pki-tks\
pki-kra\
diff --git a/scripts/kra-create.sh b/scripts/kra-create.sh
index 374f251..8d7b780 100755
--- a/scripts/kra-create.sh
+++ b/scripts/kra-create.sh
@@ -20,6 +20,9 @@ pkicreate -pki_instance_root=/var/lib \
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-*
-ln -s $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/kra/WEB-INF/classes
+
+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
systemctl restart pki-krad@$INSTANCE_NAME.service
diff --git a/scripts/theme-rebuild.sh b/scripts/theme-rebuild.sh
new file mode 100755
index 0000000..c04112c
--- /dev/null
+++ b/scripts/theme-rebuild.sh
@@ -0,0 +1,6 @@
+#!/bin/sh -x
+
+./theme-build.sh
+
+./theme-uninstall.sh
+./theme-install.sh
diff --git a/scripts/theme-reinstall.sh b/scripts/theme-reinstall.sh
new file mode 100755
index 0000000..3c261de
--- /dev/null
+++ b/scripts/theme-reinstall.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+./theme-uninstall.sh
+./theme-install.sh
diff --git a/scripts/theme-uninstall.sh b/scripts/theme-uninstall.sh
index 6c90aed..9407622 100755
--- a/scripts/theme-uninstall.sh
+++ b/scripts/theme-uninstall.sh
@@ -1,6 +1,7 @@
#!/bin/sh -x
-rpm -ev dogtag-pki-ca-theme\
+rpm -ev --nodeps\
+ dogtag-pki-ca-theme\
dogtag-pki-kra-theme\
dogtag-pki-tps-theme\
dogtag-pki-tks-theme\