summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2016-03-29 18:47:20 -0600
committerMatthew Harmsen <mharmsen@redhat.com>2016-03-29 18:47:20 -0600
commit5887e73c212da40f8bb36845acaf7840753e7684 (patch)
tree61fb42630f8a8368d315761c31f8f8e04c1a4b94
parent6c671b6356699a3cb677fd6e8f23939e0f6e260a (diff)
downloadpki-5887e73c212da40f8bb36845acaf7840753e7684.tar.gz
pki-5887e73c212da40f8bb36845acaf7840753e7684.tar.xz
pki-5887e73c212da40f8bb36845acaf7840753e7684.zip
Synced some more pki-core spec file changes from DOGTAG_10_2_6_BRANCH.
-rw-r--r--specs/pki-core.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index b4f5f2e2b..cf02f67e2 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -790,7 +790,7 @@ then
else
# On RPM upgrade run system upgrade
- echo "Upgrading system at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+ echo "Upgrading PKI system configuration at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
/sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
fi
@@ -810,10 +810,14 @@ fi
## from EITHER 'sysVinit' OR previous 'systemd' processes to the new
## PKI deployment process
-echo "Upgrading server at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+echo "Upgrading PKI server configuration at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+# Migrate Tomcat configuration
+/sbin/pki-server migrate >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+
systemctl daemon-reload
## %preun -n pki-server