From 46deb04005449da75081ec18dfc22e84d7ad7530 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 26 Sep 2022 23:47:55 +0200
Subject: [PATCH] lxc-solr: choose java package and download URL according to
 Solr Version

---
 CHANGELOG.md            |  1 +
 lxc-solr/tasks/solr.yml | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50ad3561..09044345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Changed
 
+* lxc-solr: choose java package and download URL according to Solr Version
 * lxc-solr: detect the real partition options
 
 ### Fixed
diff --git a/lxc-solr/tasks/solr.yml b/lxc-solr/tasks/solr.yml
index 4cf521ae..3a4baa1f 100644
--- a/lxc-solr/tasks/solr.yml
+++ b/lxc-solr/tasks/solr.yml
@@ -1,16 +1,31 @@
 ---
-- name: Install openjdk-8-jre-headless and lsof packages
-  command: "lxc-attach -n {{name}} -- apt-get install -y openjdk-8-jre-headless lsof"
+
+- name: "Set values for Solr < 9.0.0"
+  set_fact:
+    java_package: openjdk-8-jre-headless
+    tarball_url: https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
+    tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
+  when: "solr_version is version('9.0.0', '<')"
+
+- name: "Set values for Solr >= 9.0.0"
+  set_fact:
+    java_package: openjdk-11-jre-headless
+    tarball_url: https://archive.apache.org/dist/solr/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
+    tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
+  when: "solr_version is version('9.0.0', '>=')"
+
+- name: Install java and lsof packages
+  command: "lxc-attach -n {{ name }} -- apt-get install -y {{ java_package }} lsof"
 
 - name: "Download Solr {{ solr_version }}"
   get_url:
-    url: "https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz"
-    dest: "/var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz"
+    url: "{{ tarball_url }}"
+    dest: "{{ tarball_path }}"
     mode: '0644'
 
 - name: "Extract solr-{{ solr_version }}.tgz"
   unarchive:
-    src: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
+    src: "{{ tarball_path }}"
     dest: /var/lib/lxc/{{ name }}/rootfs/root/
     remote_src: yes
 
@@ -36,7 +51,8 @@
 - name: "Set Solr port to {{ solr_port }}"
   lineinfile:
     dest: /var/lib/lxc/{{ name }}/rootfs/etc/default/solr.in.sh
-    line: "SOLR_PORT={{ solr_port }}"
+    line: "SOLR_PORT=\"{{ solr_port }}\""
+    regexp: "^SOLR_PORT="
 
 - name: "Start Solr"
   command: "lxc-attach -n {{name}} -- /etc/init.d/solr start"