From 4261309231b448504a1ca2f10b3a59cbc879f69f Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 9 Dec 2022 14:14:30 -0400 Subject: [PATCH 1/4] Add tempDirectory to Homarus config. --- roles/internal/Islandora-Devops.crayfish/defaults/main.yml | 1 + .../templates/Homarus/services.yaml.j2 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/roles/internal/Islandora-Devops.crayfish/defaults/main.yml b/roles/internal/Islandora-Devops.crayfish/defaults/main.yml index c6b762ac..d84a39c0 100644 --- a/roles/internal/Islandora-Devops.crayfish/defaults/main.yml +++ b/roles/internal/Islandora-Devops.crayfish/defaults/main.yml @@ -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 index a794988f..d9d1e6b2 100644 --- 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'] From 146a158cb2bd65b1b7bc057b9d734a867e7e306d Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 9 Dec 2022 14:37:29 -0400 Subject: [PATCH 2/4] Update crayfish default version to 3.x. --- .../Islandora-Devops.crayfish/README.md | 23 ++++++++++++++----- .../Islandora-Devops.crayfish/tests/mysql.yml | 2 +- .../Islandora-Devops.crayfish/tests/pgsql.yml | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/roles/internal/Islandora-Devops.crayfish/README.md b/roles/internal/Islandora-Devops.crayfish/README.md index 0b455697..8b26c1dc 100644 --- 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/tests/mysql.yml b/roles/internal/Islandora-Devops.crayfish/tests/mysql.yml index 8ef33b33..093e7d14 100644 --- 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 index 6fc15adf..214e660e 100644 --- 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 From c1f59921fdbbb74d291bd824625a9375d74df7a8 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 9 Dec 2022 14:38:05 -0400 Subject: [PATCH 3/4] Update crayfish default in main to 3.x. --- roles/internal/Islandora-Devops.crayfish/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/internal/Islandora-Devops.crayfish/defaults/main.yml b/roles/internal/Islandora-Devops.crayfish/defaults/main.yml index d84a39c0..bb03cc4c 100644 --- 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 From 5976105b8c55f4a174ae9b662cdaec87a8d4f95c Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 9 Dec 2022 17:25:25 -0400 Subject: [PATCH 4/4] Vagrant uses the version of crayfish defined in the role. --- inventory/vagrant/group_vars/crayfish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory/vagrant/group_vars/crayfish.yml b/inventory/vagrant/group_vars/crayfish.yml index 4f65f875..3665d8d9 100644 --- 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"