Merge pull request #138 from sermo-de-arboribus/solr-9-default-cores

Adjust path for default cores in Solr 9
geerlingguy · Oct 5, 2023 · 2a5d7ec · 2a5d7ec
2 parents a11102f + f470d6a
commit 2a5d7ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -29,6 +29,8 @@ solr_opts: "$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
 solr_cores:
   - collection1
 
+solr_default_core_path: "{% if solr_version.split('.')[0] < '9' %}{{ solr_install_path }}/example/files/conf/{% else %}{{ solr_install_path }}/server/solr/configsets/_default/conf/{% endif %}"
+
 solr_config_file: /etc/default/{{ solr_service_name }}.in.sh
 
 # Enable restart solr handler

diff --git a/tasks/cores.yml b/tasks/cores.yml
@@ -18,7 +18,7 @@
   with_items: "{{ solr_cores }}"
 
 - name: Ensure core configuration directories exist.
-  command: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
+  command: "cp -r {{ solr_default_core_path }} {{ solr_home }}/data/{{ item }}/"
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
   become: true