From 5887e73c212da40f8bb36845acaf7840753e7684 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Tue, 29 Mar 2016 18:47:20 -0600 Subject: Synced some more pki-core spec file changes from DOGTAG_10_2_6_BRANCH. --- specs/pki-core.spec | 8 ++++++-- 1 file 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 -- cgit