Skip to content

Commit

Permalink
YDA-5610: February 2024 update
Browse files Browse the repository at this point in the history
To MSL_CKAN_Core v1.4.0 and MSL-API v1.5.0.

Starting with version v1.4.0 of the core plugin, the Solr schema
will be bundled with the plugin, so the Solr schema template in
the Ansible playbook has been removed.
  • Loading branch information
stsnel committed Feb 26, 2024
1 parent b2c0ea8 commit f184836
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 369 deletions.
5 changes: 3 additions & 2 deletions roles/ckan/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ckanext_scheming_version: release-2.1.0
# whereas the branch parameter is used for updating the code. They are separate parameters
# so that we can reference a specific commit in the code base while still getting
# the correct Solr schema. They would usually be the same, however.
ckan_msl_core_plugin_version: 1.3.0
ckan_msl_core_plugin_branch: 1.3.0
ckan_msl_core_plugin_version: 1.4.0
ckan_msl_core_plugin_branch: 1.4.0
ckan_msl_util_plugin_branch: 1.0.0
ckan_msl_vocabularies_endpoint: https://epos-msl.ckan.test/webservice/api/vocabularies
13 changes: 7 additions & 6 deletions roles/ckan/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,21 @@


- name: Ensure default schema has been backed up
ansible.builtin.command: "mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.orig"
ansible.builtin.command:
cmd: "mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.orig"
creates: /etc/solr/conf/schema.xml.orig
when: solrschema.stat.exists and solrschema.stat.isreg is defined and solrschema.stat.isreg


- name: Use custom Solr scheme for EPOS-MSL
become_user: root
become: true
ansible.builtin.template:
src: solrschema.xml.j2
ansible.posix.synchronize:
src: /usr/lib/ckan/msl_ckan_core/ckanext/msl_ckan/config/solr/schema.xml
dest: /etc/solr/conf/schema.xml
owner: root
group: root
mode: "0644"
notify: Restart Solr
delegate_to: "{{ inventory_hostname }}"
when: not ansible_check_mode


- name: Check who.ini
Expand Down
2 changes: 2 additions & 0 deletions roles/ckan/templates/ckan.ini.j2
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ mslfacets.dataset_config = ckanext.msl_ckan:config/facets.json

mslindexfields.field_config = ckanext.msl_ckan:config/msl_index_fields.json

mslvocabularies.endpoint_root = {{ ckan_msl_vocabularies_endpoint }}

# Define which views should be created by default
# (plugins must be loaded in ckan.plugins)
ckan.views.default_views = image_view text_view recline_view
Expand Down
Loading

0 comments on commit f184836

Please sign in to comment.