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