Merge pull request #17 from wcm-io-devops/feature/debian10_support

Add Debian 10 support; remove Debian 8 support
wcm-io-devops · Mar 11, 2020 · 2dd3fcc · 2dd3fcc
2 parents b3c0aae + 2705062
commit 2dd3fcc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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.
 

diff --git 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-9.yml b/vars/distribution_Debian-9.yml
diff --git 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"
+aem_dispatcher_libssl_path: /usr/lib/x86_64-linux-gnu
diff --git 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
@@ -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') }}"
+_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' }}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		aem_dispatcher_libssl_version: "1.0.0"
		aem_dispatcher_libssl_path: /lib/x86_64-linux-gnu