diff options
| author | Christina Fu <cfu@redhat.com> | 2015-06-17 14:25:33 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2015-06-18 15:33:26 -0700 |
| commit | 311650625be0c8e5f42c71c7d5020e5a11ecf034 (patch) | |
| tree | 15dfdc13dfe580cdd4501f15e912acf368141cfe | |
| parent | 3c75fd731140e470467206e7cf331bf174da1f5b (diff) | |
| download | pki-311650625be0c8e5f42c71c7d5020e5a11ecf034.tar.gz pki-311650625be0c8e5f42c71c7d5020e5a11ecf034.tar.xz pki-311650625be0c8e5f42c71c7d5020e5a11ecf034.zip | |
ticket 867 symkey library path link fix
| -rw-r--r-- | base/server/etc/default.cfg | 2 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 7 | ||||
| -rw-r--r-- | specs/pki-core.spec | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 0d3e41bbb..58f338692 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -261,6 +261,7 @@ pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil. # These are used in the processing of pkispawn and are not supposed # to be overwritten by user configuration files pki_jss_jar=%(jni_jar_dir)s/jss4.jar +pki_symkey_jar=%(jni_jar_dir)s/symkey.jar pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar pki_apache_commons_io_jar=/usr/share/java/apache-commons-io.jar pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar @@ -284,6 +285,7 @@ pki_xerces_j2_jar=/usr/share/java/xerces-j2.jar pki_xml_commons_apis_jar=/usr/share/java/xml-commons-apis.jar pki_xml_commons_resolver_jar=/usr/share/java/xml-commons-resolver.jar pki_jss_jar_link=%(pki_tomcat_common_lib_path)s/jss4.jar +pki_symkey_jar_link=%(pki_tomcat_common_lib_path)s/symkey.jar pki_apache_commons_collections_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-collections.jar pki_apache_commons_io_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-io.jar pki_apache_commons_lang_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-lang.jar diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index b5f849ad4..6cd98bb35 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -286,6 +286,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_instance_log_path'], deployer.mdict['pki_instance_logs_link']) + # create the sym link to symkey regardless of subsystem + # as long as pki-symkey is installed on the system + if os.path.exists(deployer.mdict['pki_symkey_jar']): + if not os.path.exists(deployer.mdict['pki_symkey_jar_link']): + deployer.symlink.create( + deployer.mdict['pki_symkey_jar'], + deployer.mdict['pki_symkey_jar_link']) return self.rv def destroy(self, deployer): diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 0ed192483..72ff71635 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -686,12 +686,6 @@ for subsystem in ca kra ocsp tks tps; do ln -s %{_javadir}/pki/pki-$subsystem.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib done -# Create symkey symlink for TPS and TKS -# ...WEB-INF/lib should already have been created -for subsystem in tks tps; do - ln -s %{_jnidir}/symkey.jar %{buildroot}%{_datadir}/pki/$subsystem/webapps/$subsystem/WEB-INF/lib -done - %if %{with server} %if ! 0%{?rhel} |