diff --git a/.secrets.baseline b/.secrets.baseline index 88596194a..7ca0224bd 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -144,7 +144,7 @@ "filename": "playbooks/acs.yml", "hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5", "is_verified": false, - "line_number": 498 + "line_number": 500 } ], "roles/activemq/molecule/default/tests/test_activemq.py": [ @@ -208,5 +208,5 @@ } ] }, - "generated_at": "2025-02-20T16:51:31Z" + "generated_at": "2025-02-20T20:40:33Z" } diff --git a/7.3.N-extra-vars.yml b/7.3.N-extra-vars.yml index 10053e95c..9e63b4c25 100644 --- a/7.3.N-extra-vars.yml +++ b/7.3.N-extra-vars.yml @@ -28,4 +28,3 @@ transform: dependencies_version: postgresql_connector: 42.6.1 postgres_major_version: 14 - imagemagick: 7.1.0-16-ci-11 diff --git a/7.4.N-extra-vars.yml b/7.4.N-extra-vars.yml index fa37921e6..856d2e90f 100644 --- a/7.4.N-extra-vars.yml +++ b/7.4.N-extra-vars.yml @@ -31,4 +31,3 @@ transform: dependencies_version: postgresql_connector: 42.6.1 postgres_major_version: 14 - imagemagick: 7.1.0-16-ci-11 diff --git a/group_vars/all.yml b/group_vars/all.yml index 383eb8a4b..ce403569a 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -97,7 +97,6 @@ use_custom_keystores: false dependencies_version: postgresql_connector: 42.6.1 postgres_major_version: 15 - imagemagick: 7.1.0-16-ci-11 temurin_arch: "{{ 'x64' if ansible_architecture == 'x86_64' else ansible_architecture }}" dependencies_url: postgresql_connector: >- diff --git a/playbooks/acs.yml b/playbooks/acs.yml index ee543f748..58840e879 100644 --- a/playbooks/acs.yml +++ b/playbooks/acs.yml @@ -187,12 +187,14 @@ vars: ats_keystore: "{{ transformers_keystore | default({}) }}" java_version: "{{ acs_play_java_version }}" - transformers_libreoffice_version: "{{ acs_play_te_libre_version }}" - transformers_libreoffice_archive_url: "{{ acs_play_te_libre_archive_url }}" - transformers_libreoffice_archive_checksum_url: "{{ acs_play_te_libre_archive_checksum_url }}" - transformers_pdf_version: "{{ acs_play_te_pdf_version }}" - transformers_pdf_archive_url: "{{ acs_play_te_pdf_archive_url }}" - transformers_pdf_archive_checksum_url: "{{ acs_play_te_pdf_archive_checksum_url }}" + transformers_libreoffice_version: "{{ acs_play_transformers_libreoffice_version }}" + transformers_libreoffice_archive_url: "{{ acs_play_transformers_libreoffice_archive_url }}" + transformers_libreoffice_archive_checksum_url: "{{ acs_play_transformers_libreoffice_archive_checksum_url }}" + transformers_pdf_version: "{{ acs_play_transformers_pdf_version }}" + transformers_pdf_archive_url: "{{ acs_play_transformers_pdf_archive_url }}" + transformers_pdf_archive_checksum_url: "{{ acs_play_transformers_pdf_archive_checksum_url }}" + transformers_imagemagick_version: "{{ acs_play_transformers_imagemagick_version }}" + transformers_imagemagick_repository: "{{ acs_play_transformers_imagemagick_repository }}" post_tasks: - name: Update installation status file with Transformers become: true diff --git a/playbooks/group_vars/transformers.yml b/playbooks/group_vars/transformers.yml index 346063080..0af2c37b5 100644 --- a/playbooks/group_vars/transformers.yml +++ b/playbooks/group_vars/transformers.yml @@ -8,14 +8,16 @@ acs_play_trouter_repository: "{{ nexus_repository.enterprise_releases }}" acs_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" acs_play_trouter_download_zip_sha1_checksum_url: "sha1:{{ acs_play_trouter_download_zip_url }}.sha1" -acs_play_te_libre_artifact_name: libreoffice-dist -acs_play_te_libre_archive_name: "{{ acs_play_te_libre_artifact_name }}-{{ acs_play_te_libre_version }}-{{ pkg_format }}.gz" -acs_play_te_libre_repository: "{{ artifacts_repositories.community.base_url }}/repositories/thirdparty/org/libreoffice" -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 }}" -acs_play_te_libre_archive_checksum_url: "sha1:{{ acs_play_te_libre_archive_url }}.sha1" +acs_play_transformers_libreoffice_artifact_name: libreoffice-dist +acs_play_transformers_libreoffice_archive_name: "{{ acs_play_transformers_libreoffice_artifact_name }}-{{ acs_play_transformers_libreoffice_version }}-{{ pkg_format }}.gz" +acs_play_transformers_libreoffice_repository: "{{ artifacts_repositories.community.base_url }}/repositories/thirdparty/org/libreoffice" +acs_play_transformers_libreoffice_archive_url: "{{ acs_play_transformers_libreoffice_repository }}/{{ acs_play_transformers_libreoffice_artifact_name }}/{{ acs_play_transformers_libreoffice_version }}/{{ acs_play_transformers_libreoffice_archive_name }}" +acs_play_transformers_libreoffice_archive_checksum_url: "sha1:{{ acs_play_transformers_libreoffice_archive_url }}.sha1" -acs_play_te_pdf_artifact_name: alfresco-pdf-renderer -acs_play_te_pdf_archive_name: "{{ acs_play_te_pdf_artifact_name }}-{{ acs_play_te_pdf_version }}-linux.tgz" -acs_play_te_pdf_repository: "{{ nexus_repository.releases }}" -acs_play_te_pdf_archive_url: "{{ acs_play_te_pdf_repository }}/{{ acs_play_te_pdf_artifact_name }}/{{ acs_play_te_pdf_version }}/{{ acs_play_te_pdf_archive_name }}" -acs_play_te_pdf_archive_checksum_url: "sha1:{{ acs_play_te_pdf_archive_url }}.sha1" +acs_play_transformers_pdf_artifact_name: alfresco-pdf-renderer +acs_play_transformers_pdf_archive_name: "{{ acs_play_transformers_pdf_artifact_name }}-{{ acs_play_transformers_pdf_version }}-linux.tgz" +acs_play_transformers_pdf_repository: "{{ nexus_repository.releases }}" +acs_play_transformers_pdf_archive_url: "{{ acs_play_transformers_pdf_repository }}/{{ acs_play_transformers_pdf_artifact_name }}/{{ acs_play_transformers_pdf_version }}/{{ acs_play_transformers_pdf_archive_name }}" +acs_play_transformers_pdf_archive_checksum_url: "sha1:{{ acs_play_transformers_pdf_archive_url }}.sha1" + +acs_play_transformers_imagemagick_repository: "{{ nexus_repository.releases }}" diff --git a/roles/transformers/defaults/main.yml b/roles/transformers/defaults/main.yml index d66406f11..ab62f7250 100644 --- a/roles/transformers/defaults/main.yml +++ b/roles/transformers/defaults/main.yml @@ -24,3 +24,6 @@ transformers_pdf_version: 1.1 transformers_pdf_archive_name: "{{ transformers_pdf_artifact_name }}-{{ transformers_pdf_version }}-linux.tgz" transformers_pdf_archive_url: "{{ transformers_pdf_repository }}/{{ transformers_pdf_artifact_name }}/{{ transformers_pdf_version }}/{{ transformers_pdf_archive_name }}" transformers_pdf_archive_checksum_url: "sha1:{{ transformers_pdf_archive_url }}.sha1" + +transformers_imagemagick_version: 7.1.0-16-ci-11 +transformers_imagemagick_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco diff --git a/roles/transformers/meta/argument_specs.yml b/roles/transformers/meta/argument_specs.yml index bbbf3291b..d30809088 100644 --- a/roles/transformers/meta/argument_specs.yml +++ b/roles/transformers/meta/argument_specs.yml @@ -40,3 +40,13 @@ argument_specs: required: false description: | URL to download the checksum of the Alfresco PDF Renderer archive from. + transformers_imagemagick_version: + type: str + required: false + description: | + Version of ImageMagick to install. + transformers_imagemagick_repository: + type: str + required: false + description: | + URL of the repository where the ImageMagick distribution is stored. diff --git a/roles/transformers/tasks/imagemagick.yml b/roles/transformers/tasks/imagemagick.yml index 6ffb46f0b..dec9c5e1e 100644 --- a/roles/transformers/tasks/imagemagick.yml +++ b/roles/transformers/tasks/imagemagick.yml @@ -14,20 +14,20 @@ - name: Download ImageMagick distribution vars: - pkg_name: "{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}" - pkg_url: "{{ nexus_repository.releases }}/../imagemagick/imagemagick-distribution/{{ imagemagick_version }}/{{ pkg_name }}" + pkg_name: "{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + transformers_imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}" + pkg_url: "{{ transformers_imagemagick_repository }}/../imagemagick/imagemagick-distribution/{{ transformers_imagemagick_version }}/{{ pkg_name }}" ansible.builtin.get_url: url: "{{ pkg_url }}" checksum: "sha1:{{ lookup('url', pkg_url + '.sha1') }}" dest: "{{ download_location }}/{{ pkg_name }}" mode: "0644" - loop: "{{ transformers_imagemagick_packages }}" + loop: "{{ transformers_imagemagick_packages }}" - name: Install ImageMagick deb packages become: true when: pkg_format == 'deb' ansible.builtin.apt: - deb: "{{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}" + deb: "{{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + transformers_imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }}" state: present loop: "{{ transformers_imagemagick_packages }}" @@ -37,6 +37,6 @@ ansible.builtin.dnf: state: present name: >- - {{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }} + {{ download_location }}/{{ item | replace('imagemagick-distribution', 'imagemagick-distribution-' + transformers_imagemagick_version) }}{{ imagemagick_package_arch }}.{{ pkg_format }} disable_gpg_check: true loop: "{{ transformers_imagemagick_packages }}" diff --git a/roles/transformers/templates/alfresco-tengine-aio.service.j2 b/roles/transformers/templates/alfresco-tengine-aio.service.j2 index fd5365edd..7fb5041b8 100644 --- a/roles/transformers/templates/alfresco-tengine-aio.service.j2 +++ b/roles/transformers/templates/alfresco-tengine-aio.service.j2 @@ -15,7 +15,7 @@ s {%- macro im_cfg() -%} {%- if pkg_format == 'deb' -%} -{{ imagemagick_home }}/lib/x86_64-linux-gnu/ImageMagick-{{ imagemagick_version.split('-')[0] -}} +{{ imagemagick_home }}/lib/x86_64-linux-gnu/ImageMagick-{{ transformers_imagemagick_version.split('-')[0] -}} {%- else -%} {{ imagemagick_home }} {%- endif -%} diff --git a/roles/transformers/vars/Debian.yml b/roles/transformers/vars/Debian.yml index 4ad0b46e7..8d6c4269b 100644 --- a/roles/transformers/vars/Debian.yml +++ b/roles/transformers/vars/Debian.yml @@ -2,7 +2,7 @@ transformers_imagemagick_packages: - imagemagick-distribution-linux -imagemagick_home: "/opt/imagemagick-{{ imagemagick_version | regex_search('^[0-9]+') }}" +imagemagick_home: "/opt/imagemagick-{{ transformers_imagemagick_version | regex_search('^[0-9]+') }}" utils_transform: - libcairo2 diff --git a/roles/transformers/vars/RedHat.yml b/roles/transformers/vars/RedHat.yml index b0dc025f8..de008f2e9 100644 --- a/roles/transformers/vars/RedHat.yml +++ b/roles/transformers/vars/RedHat.yml @@ -1,5 +1,5 @@ --- -imagemagick_home: "/usr/lib64/ImageMagick-{{ imagemagick_version.split('-')[0] }}" +imagemagick_home: "/usr/lib64/ImageMagick-{{ transformers_imagemagick_version.split('-')[0] }}" utils_transform: - cairo diff --git a/roles/transformers/vars/main.yml b/roles/transformers/vars/main.yml index 9ba7ce137..dfcac444b 100644 --- a/roles/transformers/vars/main.yml +++ b/roles/transformers/vars/main.yml @@ -2,5 +2,3 @@ # vars file for transformers ghostscript_packages: - ghostscript - -imagemagick_version: "{{ dependencies_version.imagemagick }}" diff --git a/vars/acs23.yml b/vars/acs23.yml index 3a89cc6a9..fbeb22ce6 100644 --- a/vars/acs23.yml +++ b/vars/acs23.yml @@ -29,5 +29,6 @@ acs_play_sfs_version: 4.1.6 acs_play_sync_version: 5.1.0 acs_play_tomcat_version: 10.1.34 acs_play_trouter_version: 4.1.6 -acs_play_te_libre_version: 7.2.5.1 -acs_play_te_pdf_version: 1.1 +acs_play_transformers_libreoffice_version: 7.2.5.1 +acs_play_transformers_pdf_version: 1.1 +acs_play_transformers_imagemagick_version: 7.1.0-16-ci-11 diff --git a/vars/acs73.yml b/vars/acs73.yml index 28d879bf2..35509bd81 100644 --- a/vars/acs73.yml +++ b/vars/acs73.yml @@ -18,5 +18,6 @@ acs_play_sfs_version: 4.1.6 acs_play_sync_version: 3.11.3 acs_play_tomcat_version: 9.0.98 acs_play_trouter_version: 4.1.6 -acs_play_te_libre_version: 7.2.5.1 -acs_play_te_pdf_version: 1.1 +acs_play_transformers_libreoffice_version: 7.2.5.1 +acs_play_transformers_pdf_version: 1.1 +acs_play_transformers_imagemagick_version: 7.1.0-16-ci-11 diff --git a/vars/acs74.yml b/vars/acs74.yml index 16035acb2..66873cb26 100644 --- a/vars/acs74.yml +++ b/vars/acs74.yml @@ -27,5 +27,6 @@ acs_play_sfs_version: 4.1.6 acs_play_sync_version: 3.11.3 acs_play_tomcat_version: 9.0.98 acs_play_trouter_version: 4.1.6 -acs_play_te_libre_version: 7.2.5.1 -acs_play_te_pdf_version: 1.1 +acs_play_transformers_libreoffice_version: 7.2.5.1 +acs_play_transformers_pdf_version: 1.1 +acs_play_transformers_imagemagick_version: 7.1.0-16-ci-11