Merge pull request #216 from Islandora-Devops/214-cantaloupe-jp2

Cantaloupe Support JP2 out of the box
Islandora-Devops · May 4, 2022 · 942fa7a · 942fa7a
2 parents cc3cc12 + dc8ecf5
commit 942fa7a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/inventory/vagrant/group_vars/tomcat.yml b/inventory/vagrant/group_vars/tomcat.yml
@@ -69,7 +69,7 @@ cantaloupe_deploy_war_path: "{{ tomcat9_home }}/webapps"
 cantaloupe_user: tomcat
 cantaloupe_group: tomcat
 cantaloupe_admin_enabled: "true"
-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"
@@ -82,3 +82,5 @@ 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
diff --git 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"

diff --git 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
@@ -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

diff --git a/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2 b/roles/internal/Islandora-Devops.cantaloupe/templates/cantaloupe.properties.j2
@@ -409,6 +409,10 @@ GraphicsMagickProcessor.path_to_binaries = {{ cantaloupe_GraphicsMagickProcessor
 # ImageMagickProcessor
 #----------------------------------------
 
+#----------------------------------------
+# ImageMagickProcessor
+#----------------------------------------
+
 # !! Optional absolute path of the directory containing the ImageMagick
 # binary. Overrides the PATH.
 ImageMagickProcessor.path_to_binaries = {{ cantaloupe_ImageMagickProcessor_path_to_binaries }}

diff --git 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