lxc-solr: use default JRE package
gitea/ansible-roles/pipeline/head This commit looks good Details

This commit is contained in:
Jérémy Lecour 2022-09-30 11:39:50 +02:00 committed by Jérémy Lecour
parent 792d1170ab
commit c6fb24f7d8
2 changed files with 2 additions and 4 deletions

View File

@ -15,7 +15,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
### Changed ### Changed
* java: use default JRE package when version is not specified * java: use default JRE package when version is not specified
* lxc-solr: choose java package and download URL according to Solr Version * lxc-solr: download URL according to Solr Version
* lxc-solr: detect the real partition options * lxc-solr: detect the real partition options
* lxc-solr: set homedir and port at install * lxc-solr: set homedir and port at install

View File

@ -2,7 +2,6 @@
- name: "Set values for Solr < 9.0.0" - name: "Set values for Solr < 9.0.0"
set_fact: set_fact:
java_package: openjdk-8-jre-headless
tarball_url: https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz 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 tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
start_command: "/etc/init.d/solr start" start_command: "/etc/init.d/solr start"
@ -11,7 +10,6 @@
- name: "Set values for Solr >= 9.0.0" - name: "Set values for Solr >= 9.0.0"
set_fact: set_fact:
java_package: openjdk-11-jre-headless
tarball_url: https://archive.apache.org/dist/solr/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz 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 tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
start_command: "systemctl start solr" start_command: "systemctl start solr"
@ -19,7 +17,7 @@
when: "solr_version is version('9.0.0', '>=')" when: "solr_version is version('9.0.0', '>=')"
- name: Install java and lsof packages - name: Install java and lsof packages
command: "lxc-attach -n {{ name }} -- apt-get install -y {{ java_package }} lsof" command: "lxc-attach -n {{ name }} -- apt-get install -y default-jre-headless lsof"
- name: "Download Solr {{ solr_version }}" - name: "Download Solr {{ solr_version }}"
get_url: get_url: