24 Nov
2023
24 Nov
'23
3:58 p.m.
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 488c5277d0b337736ea511b0676a101df3abe421
https://github.com/xwiki/xwiki-platform/commit/488c5277d0b337736ea511b0676a…
Author: Gunter Ohrner <go(a)ohrner-it.com>
Date: 2023-11-24 (Fri, 24 Nov 2023)
Changed paths:
M
xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/src/deb/control/postinst
M
xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/src/deb/control/postinst
M
xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/src/deb/control/postinst
Log Message:
-----------
XWIKI-21608: XWIKI-21509 Broke Upgrade if Tomcat Service is Running, But Not Enabled
If the service is running, we need to restart it in any case, no matter if
it's enabled or not.
However is-active does not always seem to work if the package just gets
installed (see XWIKI-18624), so also check if it's only enabled and try to
restart it then.
(cherry picked from commit 6d56ea3ecc97cdd12e96577c669ea08878e6c527)