diff --git a/defaults/main.yml b/defaults/main.yml index 4eebb1e..9f158bd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -25,6 +25,7 @@ solr_base_dir: /opt solr_server_dir: '{{ solr_base_dir }}/solr' solr_data_dir: '{{ solr_server_dir }}/server/solr' solr_conf_dir: '{{ solr_server_dir }}/conf' +solr_ckan_conf_dir: '{{ solr_server_dir }}/server/ckan/ckan' solr_collections_base_dir: '{{ solr_data_dir }}/data/solr' solr_pid_dir: '{{ solr_server_dir }}/bin' solr_heap: 1024M @@ -42,6 +43,10 @@ solr_download_url: "https://archive.apache.org/dist/solr/solr/{{ solr_version }} solr_jar_files: - contrib/analysis-extras/lib/icu4*.jar - contrib/analysis-extras/lucene-libs/lucene-analyzers-icu*.jar + +solr9_jar_files: + - "{{ solr_server_dir }}/dist/solr-9.7.0/modules/sql/lib/jts-core-1.19.0.jar" + solr_startup_opts: '-Ddisable.configEdit=true' @@ -68,8 +73,3 @@ solr_prometheus_command_params: '-p {{ solr_prometheus_port }} -b {{ solr_zk_hos solr_prometheus_data_dir: '{{ solr_base_dir }}/solr_prometheus_exporter' solr_prometheus_conf_dir: '{{ solr_prometheus_data_dir }}/conf' solr_prometheus_conf_file: '{{ solr_prometheus_conf_dir }}/solr-exporter-config.xml' - -# JTS CORE -jts_version: "1.19.0" -jts_url: "https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/{{ jts_version }}/jts-core-{{ jts_version }}.jar" -jts_install_dir: "{{ solr_base_dir }}/server/lib" \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index c09fba4..72a3136 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -51,6 +51,23 @@ shell: cd {{ solr_server_dir }}; cp -u {{ item }} {{ solr_data_dir }}/lib with_items: '{{ solr_jar_files }}' when: solr_version is version_compare('7.5.0', '<=') + + - name: copy jts-core library + shell: cd {{ solr_server_dir }}; cp -u {{ item }} {{ solr_data_dir }}/lib + with_items: '{{ solr9_jar_files }}' + notify: Solr restart + when: solr_version is version_compare('9.7.0', '>=') + tags: [ 'solr', 'solr_default', 'solr_conf', 'solr_jts'] + + - name: copy managed schema file + ansible.builtin.template: + src: manage-schema.j2 + dest: "{{ solr_ckan_conf_dir }}" + mode: 0644 + owner: "root" + group: "root" + notify: Solr restart + tags: [ 'solr', 'solr_default', 'solr_conf', 'solr_jts' ] - name: Install the solr default template: src=solr-default.j2 dest=/etc/default/solr.in.sh mode=0644 owner=root group=root @@ -106,18 +123,4 @@ - name: Ensure that Solr prometheus exporter is started and enabled service: name=solr_prometheus_exporter state=started enabled=yes -- name: Manage the installation of the JTS core - become: true - become_user: root - when: - - solr_install - - solr_mode == 'core' - tags: ['solr', 'solr_jts_core'] - get_url: - url: "{{ jts_url }}" - dest: "{{ jts_jar_file }}.jar" - mode: '0644' - owner: "{{ solr_user }}" - group: "{{ solr_user }}" - notify: Solr restart diff --git a/templates/manage-schema.j2 b/templates/manage-schema.j2 new file mode 100644 index 0000000..b3128d4 --- /dev/null +++ b/templates/manage-schema.j2 @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +index_id + + + + + + + + + + + + + + + + + + + + + + + + +