On 01/25/2017 04:35 PM, Endi Sukma Dewata wrote:
Previously the /pki webapp was only added if the theme was present
during installation, and there were separate webapps for /pki/admin
and /pki/js. If the theme was installed later, the /pki webapp had
to be configured manually.
To simplify the installation and to support other developments
(e.g. login banner), the /pki webapp will always be added during
installation regardless of theme, and the /pki/admin and /pki/js
webapps are merged into /pki webapp. When the theme package is
installed, it will create links in /pki webapp so the theme files
will become available without additional configuration.
An upgrade script has been added to merge the /pki webapp in
existing instances.
https://fedorahosted.org/pki/ticket/2582
_______________________________________________
Pki-devel mailing list
Pki-devel(a)redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel
ACK (with CAVEAT) if tested to work.
CAVEAT: This should be separated into three separate patches (one for
base changes, one for dogtag changes, and a separate one containing the
spec file change) prior to check-in:
* Patch 1:
o base/server/python/pki/server/deployment/scriptlets/instance_layout.py
o base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml
o base/server/tomcat7/conf/Catalina/localhost/pki#js.xml
o base/server/tomcat7/conf/Catalina/localhost/pki.xml
o base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml
o base/server/tomcat8/conf/Catalina/localhost/pki#js.xml
o base/server/tomcat8/conf/Catalina/localhost/pki.xml
o base/server/upgrade/10.4.0/02-MergePKIWebapps
o delete mode 100644
base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml
o delete mode 100644
base/server/tomcat7/conf/Catalina/localhost/pki#js.xml
o delete mode 100644
base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml
o delete mode 100644
base/server/tomcat8/conf/Catalina/localhost/pki#js.xml
o create mode 100755 base/server/upgrade/10.4.0/02-MergePKIWebapps
* Patch 2:
o dogtag/common-ui/CMakeLists.txt
* Patch 3:
o specs/dogtag-pki-theme.spec