File tree Expand file tree Collapse file tree 8 files changed +28
-12
lines changed Expand file tree Collapse file tree 8 files changed +28
-12
lines changed Original file line number Diff line number Diff line change 1
1
# Dispatcher version to install
2
- aem_dispatcher_version : 4.3.2
2
+ aem_dispatcher_version : 4.3.3
3
3
# Whether to install dispatcher with SSL support
4
4
aem_dispatcher_ssl_support : true
5
5
Original file line number Diff line number Diff line change @@ -12,13 +12,15 @@ galaxy_info:
12
12
versions :
13
13
- trusty
14
14
- xenial
15
+ - bionic
15
16
- name : Debian
16
17
versions :
17
18
- jessie
18
19
- stretch
19
20
- name : EL
20
21
versions :
21
22
- 7
23
+ - 8
22
24
23
25
galaxy_tags :
24
26
- aem
Original file line number Diff line number Diff line change 22
22
username : " {{ aem_dispatcher_maven_repository_username | default(omit) }}"
23
23
password : " {{ aem_dispatcher_maven_repository_password | default(omit) }}"
24
24
version : " {{ item.version | default(aem_dispatcher_version) }}"
25
- classifier : " {{ item.classifier | default(aem_dispatcher_tarball_name | regex_replace('dispatcher-(.*)-([\\ d\\ .]*)\\ .tar\\ .gz', '\\ 1')) }}"
25
+ classifier : " {{ item.classifier | default(aem_dispatcher_tarball_name |
26
+ regex_replace('dispatcher-[\\ d|\\ .]*-(.*)\\ .tar\\ .gz', '\\ 1') ) }}"
26
27
with_items : " {{ aem_dispatcher_maven_repository_coordinates }}"
Original file line number Diff line number Diff line change 23
23
when : aem_dispatcher_install_source != "package"
24
24
25
25
- name : Include OS-specific setup.
26
- include_tasks : " setup_{{ ansible_os_family }}.yml"
26
+ include_tasks : " setup_{{ ansible_os_family }}.yml"
Original file line number Diff line number Diff line change 6
6
7
7
- name : Install SELinux Python dependencies.
8
8
package :
9
- name : libsemanage-python
9
+ name : >-
10
+ {{ 'libsemanage-python' if ansible_distribution_major_version is version('8', '<') else 'libsemanage-python3' }}
10
11
state : present
11
12
12
13
- name : Configure SELinux to allow Apache to create outbound connections.
Original file line number Diff line number Diff line change 14
14
set_fact :
15
15
aem_dispatcher_tarball_tokens :
16
16
- " dispatcher"
17
+ - " {{ aem_dispatcher_version }}"
17
18
- " apache{{ apache_version | regex_replace('(\\ d+\\ .\\ d+).*', '\\ 1') }}"
18
19
- " {{ ansible_system | lower }}"
19
- - " {{ ansible_architecture | regex_replace('_', '-') }}"
20
+ - " {{ ansible_architecture if aem_dispatcher_version is version('4.3.3', '>=')
21
+ else ansible_architecture | regex_replace('_', '-') }}"
20
22
21
- - name : Add SSL filename token.
23
+ - name : Create SSL token name from used libssl version .
22
24
set_fact :
23
- aem_dispatcher_tarball_tokens : " {{ aem_dispatcher_tarball_tokens + ['ssl'] }}"
25
+ aem_dispatcher_ssl_token : " {{ 'ssl' + aem_dispatcher_libssl_version | regex_replace('(\\ d+\\ .\\ d+).*', '\\ 1')
26
+ if aem_dispatcher_version is version('4.3.3', '>=')
27
+ else 'ssl' }}"
28
+ when : aem_dispatcher_ssl_support
29
+
30
+ - name : Add SSL token to filename tokens.
31
+ set_fact :
32
+ aem_dispatcher_tarball_tokens : " {{ aem_dispatcher_tarball_tokens + [aem_dispatcher_ssl_token] }}"
24
33
when : aem_dispatcher_ssl_support
25
34
26
35
- name : Build dispatcher tarball name.
27
36
set_fact :
28
- aem_dispatcher_tarball_name : " {{ aem_dispatcher_tarball_tokens | join('-') }}-{{ aem_dispatcher_version }} .tar.gz"
37
+ aem_dispatcher_tarball_name : " {{ aem_dispatcher_tarball_tokens | join('-') }}.tar.gz"
Original file line number Diff line number Diff line change 1
1
---
2
2
- name : Derive module filename from tarball name.
3
3
set_fact :
4
- _aem_dispatcher_module_filename :
5
- " {{ aem_dispatcher_tarball_name | regex_replace('(dispatcher-apache.*?)-.*-(. *).tar.gz ', '\\ 1-\\ 2.so') }}"
4
+ _aem_dispatcher_module_filename : >-
5
+ {{ aem_dispatcher_tarball_name | regex_replace('(dispatcher)-([\d|\.]*)-(apache[\d|\.] *).* ', '\1-\3- \2.so') }}
6
6
7
7
- name : Unpack Dispatcher module.
8
8
unarchive :
9
9
src : " {{ aem_dispatcher_download_path }}/{{ aem_dispatcher_tarball_name }}"
10
10
remote_src : yes
11
- extra_opts : ["{{ _aem_dispatcher_module_filename }}"]
12
11
dest : " {{ aem_dispatcher_module_path }}"
13
12
mode : 0755
14
13
owner : root
Original file line number Diff line number Diff line change 1
1
aem_dispatcher_module_path : /usr/lib64/httpd/modules
2
- _aem_dispatcher_apache_server_root : " {{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/httpd') }}"
2
+ _aem_dispatcher_apache_server_root : >-
3
+ {{ aem_dispatcher_apache_server_root | default(apache_server_root) | default('/etc/httpd') }}
4
+
5
+ aem_dispatcher_libssl_version : >-
6
+ {{ '1.1.1' if ansible_distribution_major_version is version('8', '>=') else '1.0.2k' }}
You can’t perform that action at this time.
0 commit comments