Skip to content

Commit 2dd3fcc

Browse files
authored
Merge pull request #17 from wcm-io-devops/feature/debian10_support
Add Debian 10 support; remove Debian 8 support
2 parents b3c0aae + 2705062 commit 2dd3fcc

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This role requires Ansible 2.4 or higher and works with Dispatcher 4.2.x or high
1515

1616
Available variables are listed below, along with default values (see `defaults/main.yml`):
1717

18-
aem_dispatcher_version: 4.3.2
18+
aem_dispatcher_version: 4.3.3
1919

2020
The dispatcher version to install.
2121

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ galaxy_info:
1515
- bionic
1616
- name: Debian
1717
versions:
18-
- jessie
1918
- stretch
19+
- buster
2020
- name: EL
2121
versions:
2222
- 7

vars/distribution_Debian-9.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

vars/distribution_Debian.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
aem_dispatcher_libssl_path: /usr/lib/x86_64-linux-gnu
2-
aem_dispatcher_libssl_version: "1.0.0"
1+
aem_dispatcher_libssl_path: /usr/lib/x86_64-linux-gnu

vars/distribution_Ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
aem_dispatcher_libssl_version: "1.0.0"
21
aem_dispatcher_libssl_path: /lib/x86_64-linux-gnu

vars/family_Debian.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
aem_dispatcher_module_path: /usr/lib/apache2/modules
2-
_aem_dispatcher_apache_server_root: "{{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/apache2') }}"
2+
_aem_dispatcher_apache_server_root: "{{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/apache2') }}"
3+
4+
aem_dispatcher_libssl_version: >-
5+
{{ '1.1' if ansible_distribution_major_version is version('10', '>=') else '1.0.2' }}

0 commit comments

Comments
 (0)