Browse Source

java: add Java 11 as possible version to install

log2mail-beats
parent
commit
5b5b8944c5
4 changed files with 12 additions and 13 deletions
  1. +4
    -9
      CHANGELOG.md
  2. +3
    -3
      java/tasks/main.yml
  3. +1
    -1
      java/tasks/openjdk.yml
  4. +4
    -0
      java/vars/main.yml

+ 4
- 9
CHANGELOG.md View File

@@ -28,6 +28,7 @@ The **patch** part changes incrementally at each release.
* evomaintenance: don't configure firewall for database if not necessary
* generate-ldif: support MariaDB 10.3
* haproxy: add a variable to keep the existing configuration
* java: add Java 11 as possible version to install
* listupgrade: install old-kernel-autoremoval script
* minifirewall: add a variable to force the check scripts update
* mongodb: mongodb: compatibility with Debian 10
@@ -51,9 +52,11 @@ The **patch** part changes incrementally at each release.
* removed some deprecations for Ansible 2.7
* apache: improve permissions in save_apache_status script
* apt: hold packages only if package is installed
* bind: the munin task was present, but not included
* bind: change name of logrotate file to bind9
* certbot: commit hook must be executed at the end
* elasticsearch: listen on local interface only by default
* evocheck: upstream verison 20.02.1
* evocheck: upstream version 20.02.1
* evocheck: cron jobs execute in verbose
* evolinux-base: use "evolinux_internal_group" for SSH authentication
* evolinux-base: Don't customize the logcheck recipient by default.
@@ -83,14 +86,6 @@ The **patch** part changes incrementally at each release.
* squid: compatibility wit Debian 10
* tomcat: package version derived from Debian version if missing
* varnish: remove custom ExecReload= script for Debian 10+
<<<<<<< HEAD
=======
* lxc: remove useless loop in apt execution
* lxc: update our default template to be compatible with Debian 10
* lxc: rely on lxc_container module instead of command module
* bind: the munin task was present, but not included
* bind: change name of logrotate file to bind9
>>>>>>> bind9_evocheck_fix

### Fixed
* etc-git: fix warnings ansible-lint


+ 3
- 3
java/tasks/main.yml View File

@@ -1,7 +1,7 @@
---
- fail:
msg: "This role support only java 8 for now !"
when: java_version != 8
# - fail:
# msg: "This role support only java 8 for now !"
# when: java_version != 8

- include: openjdk.yml
when: "{{ java_alternative == 'openjdk' }}"


+ 1
- 1
java/tasks/openjdk.yml View File

@@ -25,7 +25,7 @@
- name: This openjdk version is the default alternative
alternatives:
name: java
path: "/usr/lib/jvm/java-{{ java_version }}-openjdk-amd64/jre/bin/java"
path: "{{ java_bin_path[java_version] }}"
when: java_default_alternative
tags:
- java

+ 4
- 0
java/vars/main.yml View File

@@ -0,0 +1,4 @@
---
java_bin_path:
8: /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
11: /usr/lib/jvm/java-11-openjdk-amd64/bin/java

Loading…
Cancel
Save