From e796e5a41ea55f2ffb4eb70c0fcb25ef1907858c Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Tue, 26 Apr 2022 16:36:06 -0300 Subject: [PATCH 1/5] Change processor selection strategy for Cantaloupe due to bug. --- roles/internal/Islandora-Devops.cantaloupe/README.md | 2 +- roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/internal/Islandora-Devops.cantaloupe/README.md b/roles/internal/Islandora-Devops.cantaloupe/README.md index 0c234635..d2889736 100644 --- a/roles/internal/Islandora-Devops.cantaloupe/README.md +++ b/roles/internal/Islandora-Devops.cantaloupe/README.md @@ -11,7 +11,7 @@ Available variables are listed below, along with default values: ``` # Cantaloupe version -cantaloupe_version: 4.1.7 +cantaloupe_version: 4.1.11 # Where to extract the cantaloupe archive cantaloupe_install_root: /opt # Target of a symlink from the extracted cantaloupe archive diff --git a/roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml b/roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml index e8ef1c95..0c6b277c 100644 --- a/roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml +++ b/roles/internal/Islandora-Devops.cantaloupe/defaults/main.yml @@ -1,7 +1,7 @@ --- # Cantaloupe version -cantaloupe_version: 4.1.7 +cantaloupe_version: 4.1.11 # Where to extract the cantaloupe archive cantaloupe_install_root: /opt # Target of a symlink from the extracted cantaloupe archive From 331a148308e4752c085eeaebc56ad251ea64f60a Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Wed, 27 Apr 2022 16:12:17 -0300 Subject: [PATCH 2/5] Update Tomcat cantaloupe properties. --- inventory/vagrant/group_vars/tomcat.yml | 4 +++- .../templates/cantaloupe.properties.j2 | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/inventory/vagrant/group_vars/tomcat.yml b/inventory/vagrant/group_vars/tomcat.yml index 7dc5963e..a071e88e 100644 --- a/inventory/vagrant/group_vars/tomcat.yml +++ b/inventory/vagrant/group_vars/tomcat.yml @@ -69,6 +69,7 @@ cantaloupe_deploy_war_path: "{{ tomcat9_home }}/webapps" cantaloupe_user: tomcat cantaloupe_group: tomcat cantaloupe_admin_enabled: "true" +cantaloupe_GrokProcessor_path_to_binaries: /user/local/bin cantaloupe_OpenJpegProcessor_path_to_binaries: /usr/local/bin cantaloupe_log_application_ConsoleAppender_enabled: "false" cantaloupe_log_application_FileAppender_enabled: "true" @@ -76,9 +77,10 @@ cantaloupe_log_application_FileAppender_pathname: "{{ cantaloupe_log_path }}/app cantaloupe_log_access_FileAppender_enabled: "true" cantaloupe_log_access_FileAppender_pathname: "{{ cantaloupe_log_path }}/access.log" cantaloupe_FilesystemResolver_BasicLookupStrategy_path_prefix: /var/www/html/drupal/web/ -cantaloupe_processor_jp2: OpenJpegProcessor +cantaloupe_processor_jp2: GrokProcessor cantaloupe_cache_source: FilesystemCache cantaloupe_cache_derivative: FilesystemCache cantaloupe_create_FilesystemCache_dir: yes cantaloupe_resolver_static: HttpSource cantaloupe_HttpResolver_BasicLookupStrategy_url_prefix: "" +cantaloupe_processor_selection_strategy: ManualSelectionStrategy diff --git a/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 b/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 index 6dcbe3ef..c84e0ff2 100644 --- a/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 +++ b/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 @@ -409,6 +409,15 @@ GraphicsMagickProcessor.path_to_binaries = {{ cantaloupe_GraphicsMagickProcessor # ImageMagickProcessor #---------------------------------------- +# !! Optional absolute path of the directory containing the Grok +# binary. Overrides the PATH. + +GrokProcessor.path_to_binaries = {{ cantaloupe_GrokProcessor_path_to_binaries }} + +#---------------------------------------- +# ImageMagickProcessor +#---------------------------------------- + # !! Optional absolute path of the directory containing the ImageMagick # binary. Overrides the PATH. ImageMagickProcessor.path_to_binaries = {{ cantaloupe_ImageMagickProcessor_path_to_binaries }} From c0819651bbb9cf1935581224e09239d0003e2e7e Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Thu, 28 Apr 2022 16:09:32 -0300 Subject: [PATCH 3/5] Support OpenJP2 for Cantaloupe. --- inventory/vagrant/group_vars/tomcat.yml | 6 +++--- roles/internal/Islandora-Devops.tomcat8/defaults/main.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/inventory/vagrant/group_vars/tomcat.yml b/inventory/vagrant/group_vars/tomcat.yml index a071e88e..d47d9edb 100644 --- a/inventory/vagrant/group_vars/tomcat.yml +++ b/inventory/vagrant/group_vars/tomcat.yml @@ -69,18 +69,18 @@ cantaloupe_deploy_war_path: "{{ tomcat9_home }}/webapps" cantaloupe_user: tomcat cantaloupe_group: tomcat cantaloupe_admin_enabled: "true" -cantaloupe_GrokProcessor_path_to_binaries: /user/local/bin -cantaloupe_OpenJpegProcessor_path_to_binaries: /usr/local/bin +cantaloupe_OpenJpegProcessor_path_to_binaries: /usr/bin cantaloupe_log_application_ConsoleAppender_enabled: "false" cantaloupe_log_application_FileAppender_enabled: "true" cantaloupe_log_application_FileAppender_pathname: "{{ cantaloupe_log_path }}/application.log" cantaloupe_log_access_FileAppender_enabled: "true" cantaloupe_log_access_FileAppender_pathname: "{{ cantaloupe_log_path }}/access.log" cantaloupe_FilesystemResolver_BasicLookupStrategy_path_prefix: /var/www/html/drupal/web/ -cantaloupe_processor_jp2: GrokProcessor +cantaloupe_processor_jp2: OpenJpegProcessor cantaloupe_cache_source: FilesystemCache cantaloupe_cache_derivative: FilesystemCache cantaloupe_create_FilesystemCache_dir: yes cantaloupe_resolver_static: HttpSource cantaloupe_HttpResolver_BasicLookupStrategy_url_prefix: "" cantaloupe_processor_selection_strategy: ManualSelectionStrategy +cantaloupe_StreamProcessor_retrieval_strategy: CacheStrategy \ No newline at end of file diff --git a/roles/internal/Islandora-Devops.tomcat8/defaults/main.yml b/roles/internal/Islandora-Devops.tomcat8/defaults/main.yml index a5152c00..c59254e1 100644 --- a/roles/internal/Islandora-Devops.tomcat8/defaults/main.yml +++ b/roles/internal/Islandora-Devops.tomcat8/defaults/main.yml @@ -1,5 +1,6 @@ tomcat9_packages: - tomcat9 + - libopenjp2-tools tomcat9_admin_packages: - tomcat9-admin From f5f0cb10820d4c047f84d9e7f0976bbbdd27a9e8 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Tue, 3 May 2022 13:27:12 -0300 Subject: [PATCH 4/5] Remove missing Grok variable in Cantaloupe template. --- .../templates/cantaloupe.properties.j2 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 b/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 index c84e0ff2..ac20f5d5 100644 --- a/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 +++ b/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 @@ -409,11 +409,6 @@ GraphicsMagickProcessor.path_to_binaries = {{ cantaloupe_GraphicsMagickProcessor # ImageMagickProcessor #---------------------------------------- -# !! Optional absolute path of the directory containing the Grok -# binary. Overrides the PATH. - -GrokProcessor.path_to_binaries = {{ cantaloupe_GrokProcessor_path_to_binaries }} - #---------------------------------------- # ImageMagickProcessor #---------------------------------------- From dc8ecf5bbfd45b629bd52841a3235b0f8519e47f Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Wed, 4 May 2022 11:28:03 -0300 Subject: [PATCH 5/5] Restart Tomcat at post-install to pick up systemd changes. --- post-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/post-install.yml b/post-install.yml index 86450485..40db15ea 100644 --- a/post-install.yml +++ b/post-install.yml @@ -37,7 +37,7 @@ - name: start tomcat9 service: name: tomcat9 - state: started + state: restarted - name: Add admin to fedoraAdmin role command: "{{ drush_path }} --root {{ drupal_core_path }} -y urol fedoraadmin admin"