diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-10-27 02:56:21 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2015-10-30 19:02:56 +0100 |
| commit | c7bc6eb94aa64c89467f9394554f860dc485ad94 (patch) | |
| tree | c2de2f28f0195a2d4c0744f660252ebb5a568fb1 /specs | |
| parent | 8b5c3cf9b37e5b3be44b777545fb1887c2fb75d2 (diff) | |
| download | pki-c7bc6eb94aa64c89467f9394554f860dc485ad94.tar.gz pki-c7bc6eb94aa64c89467f9394554f860dc485ad94.tar.xz pki-c7bc6eb94aa64c89467f9394554f860dc485ad94.zip | |
Added automatic Tomcat migration.
The pki-core.spec has been modified to execute pki-server migrate
when the package is installed. This way when upgrading from F22 to
F23 all PKI instances will be migrated automatically to Tomcat 8.
The pki-server migrate command has been modified such that if there
is no specific Tomcat version specified it will use the current
Tomcat version.
The top attribute in the CLI class was not functioning properly,
so it has been replaced with get_top_module() method.
The getopt() invocations in pki-server subcommands have been
replaced with gnu_getopt() to allow intermixing options and
arguments.
https://fedorahosted.org/pki/ticket/1310
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 2680bf97f..df2e3aa9e 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -778,7 +778,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 @@ -798,10 +798,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 |