From 636702197da198bbb7cfe239d89b4a8af99fa452 Mon Sep 17 00:00:00 2001 From: Nico Bellack Date: Tue, 10 Mar 2020 15:36:52 +0100 Subject: [PATCH 1/3] Use libssl1.1 for Debian 10 hosts --- vars/distribution_Debian-10.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/distribution_Debian-10.yml diff --git a/vars/distribution_Debian-10.yml b/vars/distribution_Debian-10.yml new file mode 100644 index 0000000..f663e87 --- /dev/null +++ b/vars/distribution_Debian-10.yml @@ -0,0 +1 @@ +aem_dispatcher_libssl_version: "1.1" \ No newline at end of file From e28b645284ebc40a412d797a6caa1eebeeb8f8db Mon Sep 17 00:00:00 2001 From: Nico Bellack Date: Tue, 10 Mar 2020 16:26:23 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68ddb32..54931e9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This role requires Ansible 2.4 or higher and works with Dispatcher 4.2.x or high Available variables are listed below, along with default values (see `defaults/main.yml`): - aem_dispatcher_version: 4.3.2 + aem_dispatcher_version: 4.3.3 The dispatcher version to install. From 27050623eb30578558d83249facaa12b7ba86fa1 Mon Sep 17 00:00:00 2001 From: Nico Bellack Date: Tue, 10 Mar 2020 17:08:04 +0100 Subject: [PATCH 3/3] Set libssl version in family_Debian.yml Also, start dropping Debian 8 support --- meta/main.yml | 2 +- vars/distribution_Debian-10.yml | 1 - vars/distribution_Debian-9.yml | 1 - vars/distribution_Debian.yml | 3 +-- vars/distribution_Ubuntu.yml | 1 - vars/family_Debian.yml | 5 ++++- 6 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 vars/distribution_Debian-10.yml delete mode 100644 vars/distribution_Debian-9.yml diff --git a/meta/main.yml b/meta/main.yml index 8dd57de..7f27967 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -15,8 +15,8 @@ galaxy_info: - bionic - name: Debian versions: - - jessie - stretch + - buster - name: EL versions: - 7 diff --git a/vars/distribution_Debian-10.yml b/vars/distribution_Debian-10.yml deleted file mode 100644 index f663e87..0000000 --- a/vars/distribution_Debian-10.yml +++ /dev/null @@ -1 +0,0 @@ -aem_dispatcher_libssl_version: "1.1" \ No newline at end of file diff --git a/vars/distribution_Debian-9.yml b/vars/distribution_Debian-9.yml deleted file mode 100644 index d57ebdd..0000000 --- a/vars/distribution_Debian-9.yml +++ /dev/null @@ -1 +0,0 @@ -aem_dispatcher_libssl_version: "1.0.2" \ No newline at end of file diff --git a/vars/distribution_Debian.yml b/vars/distribution_Debian.yml index 172eb71..d93f70c 100644 --- a/vars/distribution_Debian.yml +++ b/vars/distribution_Debian.yml @@ -1,2 +1 @@ -aem_dispatcher_libssl_path: /usr/lib/x86_64-linux-gnu -aem_dispatcher_libssl_version: "1.0.0" \ No newline at end of file +aem_dispatcher_libssl_path: /usr/lib/x86_64-linux-gnu \ No newline at end of file diff --git a/vars/distribution_Ubuntu.yml b/vars/distribution_Ubuntu.yml index 3603edc..d01cef2 100644 --- a/vars/distribution_Ubuntu.yml +++ b/vars/distribution_Ubuntu.yml @@ -1,2 +1 @@ -aem_dispatcher_libssl_version: "1.0.0" aem_dispatcher_libssl_path: /lib/x86_64-linux-gnu diff --git a/vars/family_Debian.yml b/vars/family_Debian.yml index c1c0f33..84c6e5c 100644 --- a/vars/family_Debian.yml +++ b/vars/family_Debian.yml @@ -1,2 +1,5 @@ aem_dispatcher_module_path: /usr/lib/apache2/modules -_aem_dispatcher_apache_server_root: "{{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/apache2') }}" \ No newline at end of file +_aem_dispatcher_apache_server_root: "{{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/apache2') }}" + +aem_dispatcher_libssl_version: >- + {{ '1.1' if ansible_distribution_major_version is version('10', '>=') else '1.0.2' }} \ No newline at end of file