Merge pull request #240 from rosiel/homarus-tempdirectory

Add tempDirectory to Homarus config.
Islandora-Devops · Dec 13, 2022 · 28ab0ce · 28ab0ce
2 parents 75462cb + 5976105
commit 28ab0ce
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/inventory/vagrant/group_vars/crayfish.yml b/inventory/vagrant/group_vars/crayfish.yml
@@ -1,5 +1,4 @@
 ---
-crayfish_version_tag: 3.x
 crayfish_db: "{{ islandora_db }}"
 
 crayfish_fedora_base_url: "http://{{ hostvars[groups['tomcat'][0]].ansible_host }}:8080/fcrepo/rest"

diff --git a/roles/internal/Islandora-Devops.crayfish/README.md b/roles/internal/Islandora-Devops.crayfish/README.md
@@ -7,16 +7,16 @@ An Ansible role that installs [Crayfish](https://github.com/Islandora/Crayfish)
 
 ## Role Variables
 
-Available variables are listed below, along with default values:
+Key Available variables are listed below, along with default values:
 
 ```
 # Crayfish version to install
-crayfish_version_tag: 2.x
+crayfish_version_tag: 3.x
 # Crayfish services to install
 crayfish_services:
-  - Gemini
   - Houdini
   - Milliner
+  - Homarus
   - Hypercube
   - Recast
 # Default crayfish static JWT token
@@ -25,16 +25,27 @@ crayfish_syn_token: islandora
 crayfish_install_dir: /var/www/html/Crayfish
 # Crayfish log directory
 crayfish_log_dir: /var/log/islandora
-# Apache configuration directory
-crayfish_apache_conf_dir: /etc/apache2
+# URLs to Drupal and Fedora
+crayfish_drupal_base_url: http://localhost:8000
+crayfish_fedora_base_url: http://localhost:8080/fcrepo/rest
 ```
+More detailed variables can be seen in `defaults/main.yml`.
+
 Some OS dependent variables are set in vars/* but can be overridden if desired:
 
 ```
 # crayfish_user: www-data
 # httpd_conf_directory: /etc/apache2
 # crayfish_packages:
-#   - ImageMagick
+#   - imagemagick
+#   - tesseract-ocr
+#   - tesseract-ocr-fra
+#   - tesseract-ocr-deu
+#   - tesseract-ocr-ita
+#   - tesseract-ocr-spa
+#   - tesseract-ocr-srp
+#   - ffmpeg
+#   - poppler-utils
 ```
 =======
 `crayfish_db` can be set to: 

diff --git a/roles/internal/Islandora-Devops.crayfish/defaults/main.yml b/roles/internal/Islandora-Devops.crayfish/defaults/main.yml
@@ -1,4 +1,4 @@
-crayfish_version_tag: 2.x
+crayfish_version_tag: 3.x
 
 crayfish_services:
   - Houdini
@@ -103,6 +103,7 @@ crayfish_homarus_executable_config:
     default:
       mimetype: video/mp4
       format: mp4
+  tempdirectory: /tmp/
 
 # recast
 crayfish_recast_log_file: /var/log/islandora/recast.log

diff --git a/roles/internal/Islandora-Devops.crayfish/templates/Homarus/services.yaml.j2 b/roles/internal/Islandora-Devops.crayfish/templates/Homarus/services.yaml.j2
@@ -17,6 +17,7 @@ parameters:
     app.formats.defaults:
       mimetype: {{ crayfish_homarus_executable_config.formats.default.mimetype }}
       format: {{ crayfish_homarus_executable_config.formats.default.format }}
+    app.tempDirectory: {{ crayfish_homarus_executable_config.tempdirectory }}
 
 services:
     # default configuration for services in *this* file
@@ -42,4 +43,5 @@ services:
         $formats: '%app.formats.valid%'
         $defaults: '%app.formats.defaults%'
         $executable: '%app.executable%'
+        $tempDirectory: '%app.tempDirectory%'
       tags: ['controller.service_arguments']
diff --git a/roles/internal/Islandora-Devops.crayfish/tests/mysql.yml b/roles/internal/Islandora-Devops.crayfish/tests/mysql.yml
@@ -3,7 +3,7 @@
   become: yes
 
   vars:
-    crayfish_version_tag: "2.x"
+    crayfish_version_tag: "3.x"
     php_version: "7.4"
     php_packages_extra:
       - libapache2-mod-php7.4

diff --git a/roles/internal/Islandora-Devops.crayfish/tests/pgsql.yml b/roles/internal/Islandora-Devops.crayfish/tests/pgsql.yml
@@ -3,7 +3,7 @@
   become: yes
 
   vars:
-    crayfish_version_tag: "2.x"
+    crayfish_version_tag: "3.x"
     php_version: "7.4"
     php_packages_extra:
       - libapache2-mod-php7.4