File tree Expand file tree Collapse file tree 14 files changed +46
-19
lines changed
Expand file tree Collapse file tree 14 files changed +46
-19
lines changed Original file line number Diff line number Diff line change 144144 "filename": "playbooks/acs.yml",
145145 "hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5",
146146 "is_verified": false,
147- "line_number": 492
147+ "line_number": 495
148148 }
149149 ],
150150 "roles/activemq/molecule/default/tests/test_activemq.py": [
208208 }
209209 ]
210210 },
211- "generated_at": "2025-02-20T13:42:13Z "
211+ "generated_at": "2025-02-20T15:10:44Z "
212212}
Original file line number Diff line number Diff line change @@ -28,6 +28,5 @@ transform:
2828dependencies_version :
2929 postgresql_connector : 42.6.1
3030 postgres_major_version : 14
31- libreoffice : 7.2.5.1
3231 pdf_renderer : 1.1
3332 imagemagick : 7.1.0-16-ci-11
Original file line number Diff line number Diff line change @@ -31,6 +31,5 @@ transform:
3131dependencies_version :
3232 postgresql_connector : 42.6.1
3333 postgres_major_version : 14
34- libreoffice : 7.2.5.1
3534 pdf_renderer : 1.1
3635 imagemagick : 7.1.0-16-ci-11
Original file line number Diff line number Diff line change @@ -97,7 +97,6 @@ use_custom_keystores: false
9797dependencies_version :
9898 postgresql_connector : 42.6.1
9999 postgres_major_version : 15
100- libreoffice : 7.2.5.1
101100 pdf_renderer : 1.1
102101 imagemagick : 7.1.0-16-ci-11
103102temurin_arch : " {{ 'x64' if ansible_architecture == 'x86_64' else ansible_architecture }}"
Original file line number Diff line number Diff line change 187187 vars :
188188 ats_keystore : " {{ transformers_keystore | default({}) }}"
189189 java_version : " {{ acs_play_java_version }}"
190+ transformers_libreoffice_version : " {{ acs_play_te_libre_version }}"
191+ transformers_libreoffice_archive_url : " {{ acs_play_te_libre_archive_url }}"
192+ transformers_libreoffice_archive_checksum_url : " {{ acs_play_te_libre_archive_checksum_url }}"
190193 post_tasks :
191194 - name : Update installation status file with Transformers
192195 become : true
Original file line number Diff line number Diff line change @@ -2,7 +2,14 @@ acs_play_sfs_artifact_name: alfresco-shared-file-store-controller
22acs_play_sfs_repository : " {{ nexus_repository.enterprise_releases }}"
33acs_play_sfs_download_zip_url : " {{ acs_play_sfs_repository }}/{{ acs_play_sfs_artifact_name }}/{{ acs_play_sfs_version }}/{{ acs_play_sfs_artifact_name }}-{{ acs_play_sfs_version }}.jar"
44acs_play_sfs_download_zip_sha1_checksum_url : " sha1:{{ acs_play_sfs_download_zip_url }}.sha1"
5+
56acs_play_trouter_artifact_name : alfresco-transform-router
67acs_play_trouter_repository : " {{ nexus_repository.enterprise_releases }}"
78acs_play_trouter_download_zip_url : " {{ acs_play_trouter_repository }}/{{ acs_play_trouter_artifact_name }}/{{ acs_play_trouter_version }}/{{ acs_play_trouter_artifact_name }}-{{ acs_play_trouter_version }}.jar"
89acs_play_trouter_download_zip_sha1_checksum_url : " sha1:{{ acs_play_trouter_download_zip_url }}.sha1"
10+
11+ acs_play_te_libre_artifact_name : libreoffice-dist
12+ acs_play_te_libre_archive_name : " {{ acs_play_te_libre_artifact_name }}-{{ acs_play_te_libre_version }}-{{ pkg_format }}.gz"
13+ acs_play_te_libre_repository : " {{ artifacts_repositories.community.base_url }}/repositories/thirdparty/org/libreoffice"
14+ acs_play_te_libre_archive_url : " {{ acs_play_te_libre_repository }}/{{ acs_play_te_libre_artifact_name }}/{{ acs_play_te_libre_version }}/{{ acs_play_te_libre_archive_name }}"
15+ acs_play_te_libre_archive_checksum_url : " sha1:{{ acs_play_te_libre_archive_url }}.sha1"
Original file line number Diff line number Diff line change @@ -7,3 +7,12 @@ tengine_environment:
77 - -Xmx1536m
88ats_keystore : {}
99include_ghostscript : false
10+
11+ transformers_libreoffice_artifact_name : libreoffice-dist
12+ transformers_libreoffice_repository : https://artifacts.alfresco.com/nexus/content/repositories/thirdparty/org/libreoffice
13+
14+ transformers_libreoffice_version : 7.2.5.1
15+ transformers_libreoffice_archive_name : " {{ transformers_libreoffice_artifact_name }}-{{ transformers_libreoffice_version }}-{{ pkg_format }}.gz"
16+ transformers_libreoffice_archive_url : " {{ transformers_libreoffice_repository }}/{{ transformers_libreoffice_artifact_name }}/{{ transformers_libreoffice_version }}/{{ transformers_libreoffice_archive_name }}"
17+ transformers_libreoffice_archive_checksum_url : " sha1:{{ transformers_libreoffice_archive_url }}.sha1"
18+ transformers_libreoffice_home : " /opt/libreoffice{{ transformers_libreoffice_version[0:3] }}/"
Original file line number Diff line number Diff line change @@ -10,3 +10,18 @@ argument_specs:
1010 description : |
1111 Representation of the JRE keystore as expected by the java role.
1212 Check the java role's arguments specification for details.
13+ transformers_libreoffice_version :
14+ type : str
15+ required : false
16+ description : |
17+ Version of the LibreOffice package to install.
18+ transformers_libreoffice_archive_url :
19+ type : str
20+ required : false
21+ description : |
22+ URL to the LibreOffice package archive.
23+ transformers_libreoffice_archive_checksum_url :
24+ type : str
25+ required : false
26+ description : |
27+ URL to the LibreOffice package archive checksum.
Original file line number Diff line number Diff line change 44 block :
55 - name : Download libreoffice package archive
66 ansible.builtin.get_url :
7- url : " {{ libreoffice_archive_url }}"
8- checksum : sha1: {{ lookup('url', libreoffice_archive_sha1_checksum_url) }}
7+ url : " {{ transformers_libreoffice_archive_url }}"
8+ checksum : " {{ transformers_libreoffice_archive_checksum_url }} "
99 dest : " {{ download_location }}/libreoffice.tar.gz"
1010 mode : " 0644"
1111
1818 dest : " {{ download_location }}/"
1919 remote_src : true
2020 creates : >-
21- {{ download_location }}/LibreOffice_{{ dependencies_version.libreoffice }}_{{ lo_arch }}/{{ pkg_format | upper }}S/
21+ {{ download_location }}/LibreOffice_{{ transformers_libreoffice_version }}_{{ lo_arch }}/{{ pkg_format | upper }}S/
2222
2323 - name : Enumerate LibreOffice RPMs to install
2424 when : pkg_format == 'rpm'
2525 ansible.builtin.find :
26- paths : " {{ download_location }}/LibreOffice_{{ dependencies_version.libreoffice }}_Linux_{{ ansible_architecture | replace('_', '-') }}_rpm/RPMS/"
26+ paths : " {{ download_location }}/LibreOffice_{{ transformers_libreoffice_version }}_Linux_{{ ansible_architecture | replace('_', '-') }}_rpm/RPMS/"
2727 patterns : " *.rpm"
2828 register : libreoffice_rpm_files
2929
4141 {{ ansible_system }}_{{ ansible_architecture | replace('_', '-') }}
4242 ansible.builtin.shell :
4343 cmd : dpkg -i DEBS/*.deb
44- creates : /opt/libreoffice{{ dependencies_version.libreoffice | regex_search('^[0-9]+.[0-9]+') }}/program/soffice.bin
44+ creates : /opt/libreoffice{{ transformers_libreoffice_version | regex_search('^[0-9]+.[0-9]+') }}/program/soffice.bin
4545 chdir : >-
46- {{ download_location }}/LibreOffice_{{ dependencies_version.libreoffice }}_{{ lo_arch }}_deb
46+ {{ download_location }}/LibreOffice_{{ transformers_libreoffice_version }}_{{ lo_arch }}_deb
Original file line number Diff line number Diff line change 2222{% - endmacro %}
2323
2424{% - set java_opts = "-DPDFRENDERER_EXE=" + ats_home + "/alfresco-pdf-renderer \
25- -DLIBREOFFICE_HOME=" + libreoffice_home + " \
25+ -DLIBREOFFICE_HOME=" + transformers_libreoffice_home + " \
2626-DIMAGEMAGICK_ROOT=" + imagemagick_home + " \
2727-DIMAGEMAGICK_DYN=" + im_lib () + " \
2828-DIMAGEMAGICK_EXE=" + (imagemagick_home + "/bin/convert" if pkg_format == 'deb' else 'convert' ) + " \
You can’t perform that action at this time.
0 commit comments