From 59d9e8a18c2e28e0265e58986ecea398ad300a78 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 26 Sep 2017 16:28:40 +0200 Subject: [PATCH] dataminer: do not install the catalina config anymore. Add some java options as requested in https://support.d4science.org/issues/9797 --- smartgears/dataminer_app/defaults/main.yml | 2 ++ smartgears/dataminer_app/tasks/dataminer-app.yml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index cf69727a..1f50bd12 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -14,6 +14,8 @@ dataminer_wps_group_id: org.gcube.data-analysis dataminer_wps_extension: war dataminer_wps_file: '{{ dataminer_wps_name }}-{{ dataminer_wps_version }}.{{ dataminer_wps_extension }}' +# Add these to the tomcat_m_other_java_opts variable +dataminer_wps__java_opts: '-Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl' # Algorithms installer dataminer_algorithms_upgrade: False dataminer_algorithms_version: latest diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index 92936466..26002152 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -108,8 +108,9 @@ template: src=wps-config-fixer.j2 dest=/usr/local/bin/wps-config-fixer owner=root group=root mode=0555 with_items: '{{ tomcat_m_instances }}' - - name: Install the catalina additional configuration - template: src={{ dataminer_wps_name }}.xml.j2 dest={{ item.instance_path }}/conf/Catalina/localhost/{{ dataminer_wps_name }}.xml + - name: Remove the catalina additional configuration + #template: src={{ dataminer_wps_name }}.xml.j2 dest={{ item.instance_path }}/conf/Catalina/localhost/{{ dataminer_wps_name }}.xml + file: dest={{ item.instance_path }}/conf/Catalina/localhost/{{ dataminer_wps_name }}.xml state=absent with_items: '{{ tomcat_m_instances }}' notify: Restart smartgears