hyrax 4.0.0 → 5.0.0.rc2

data/app/views/hyrax/base/_workflow_actions.html.erb

@@ -6,33 +6,35 @@
   </button>
   <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
     <div id="workflow_controls_collapse" class="card-body collapse">
-      <div class="col-sm-3 workflow-actions">
-        <h3><%= t('.actions') %></h3>
+      <div class="row">
+        <div class="col-sm-3 workflow-actions">
+          <h3><%= t('.actions') %></h3>
 
-        <% presenter.workflow.actions.each do |key, label| %>
-          <div class="form-check">
-            <label class="form-check-label">
-              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
-              <%= label %>
-            </label>
-          </div>
-        <% end %>
-      </div>
-      <div class="col-sm-9 workflow-comments">
-        <div class="form-group">
-          <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
-          <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          <% presenter.workflow.actions.each do |key, label| %>
+            <div class="form-check">
+              <label class="form-check-label">
+                <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
+                <%= label %>
+              </label>
+            </div>
+          <% end %>
         </div>
+        <div class="col-sm-9 workflow-comments">
+          <div class="form-group">
+            <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
+            <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          </div>
 
-        <input class="btn btn-primary" type="submit" value="Submit" />
+          <input class="btn btn-primary" type="submit" value="Submit" />
 
-        <h4><%= t('.previous_comments') %></h4>
-        <dl>
-          <% presenter.workflow.comments.each do |comment| %>
-            <dt><%= comment.name_of_commentor %></dt>
-            <dd><%= comment.comment %></dd>
-          <% end %>
-        </dl>
+          <h4><%= t('.previous_comments') %></h4>
+          <dl>
+            <% presenter.workflow.comments.each do |comment| %>
+              <dt><%= comment.name_of_commentor %></dt>
+              <dd><%= comment.comment %></dd>
+            <% end %>
+          </dl>
+        </div>
       </div>
     </div>
   <% end %>

data/app/views/hyrax/base/file_manager.html.erb

@@ -5,7 +5,7 @@
   </li>
 </ul>
 
-<% if !@form.member_presenters.empty? %>
+<% if !@form.member_presenters.blank? %>
   <div class="row" data-action="file-manager">
     <div class="col-lg-3" id="file-manager-tools">
       <h2><%= t('.toolbar') %></h2>

data/app/views/hyrax/base/show.json.jbuilder

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-@curation_concern = Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
-  @curation_concern.is_a? Hyrax::Resource
+@curation_concern = ::Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
+  @curation_concern.is_a?(Hyrax::Resource) && Object.const_defined?("Wings")
 
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.extract! @curation_concern, *@curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.id @curation_concern.id.to_s
 json.version @curation_concern.try(:etag)

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
           { suppress_link: true }

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -12,7 +12,7 @@
     <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
       data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-    <input type="checkbox" class="disabled" disabled=true />
+    <input type="checkbox" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb

@@ -11,8 +11,8 @@
   <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
       <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page' do %>
-         <div class="form-group row form-control-lg">
-           <fieldset class="col-sm-9">
+         <div class="form-group row">
+           <fieldset class="col-sm-7 col-lg-8">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
              <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
@@ -22,7 +22,7 @@
              <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort)) %>
              <button class="btn btn-info"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
-           <div class="col-sm-3">
+           <div class="col-sm-5 col-lg-4">
              <%= render 'hyrax/collections/view_type_group' %>
            </div>
          </div>

data/app/views/hyrax/file_sets/_versioning.html.erb

@@ -1,6 +1,6 @@
 <div id="versioning_display" class="tab-pane">
   <h2><%= t('.header') %></h2>
-  <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
+  <% if @version_list.supports_multiple_versions? %><%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
     <div id="fileuploadVersioning">
       <!-- Redirect browsers with JavaScript disabled to the origin page -->
       <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"/></noscript>
@@ -45,10 +45,10 @@
         <%= t('.upload') %>
       <% end %>
 
-    </div> <!-- fileuploadVersioning -->
-  <% end %>
+    </div> <!-- /fileuploadVersioning -->
+  <% end %><% end %>
 
-  <%= form_for [main_app, curation_concern],
+  <% if !@version_list.empty? %><%= form_for [main_app, curation_concern],
                html: { class: 'edit_file_set_previous_version nav-safety' } do |f| %>
     <h3><%= t('.restore') %></h3>
     <% @version_list.each do |version| %>
@@ -68,7 +68,7 @@
                  type: 'submit' do %>
       <%= t('.save') %>
     <% end %>
-  <% end %>
+  <% end %><% end %>
 
   <%= render 'hyrax/uploads/js_templates_versioning' %>
 

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -2,8 +2,8 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
@@ -15,8 +15,8 @@
 <% else %>
     <div>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
     </div>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -4,7 +4,7 @@
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
-      data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+      data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -2,8 +2,8 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+        <source src="<%= hyrax.download_path(file_set, file: 'webm', mime_type: 'video/webm') %>" type="video/webm" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp4', mime_type: 'video/mp4') %>" type="video/mp4" />
         <%= t('hyrax.file_set.show.downloadable_content.video_tag_not_supported') %>
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),

data/app/views/hyrax/file_sets/show.html.erb

@@ -11,8 +11,10 @@
         <%= render 'file_set_title', presenter: @presenter %>
       </header>
 
-      <%# TODO: render 'show_descriptions' See https://github.com/samvera/hyrax/issues/1481 %>
-      <%= render 'show_details' %>
+      <% @presenter.show_partials.each do |partial_path| %>
+      <%= render partial_path %>
+      <% end %>
+
       <%= render 'hyrax/users/activity_log', events: @presenter.events %>
     </div><!-- /columns second -->
   </div> <!-- /.row -->
@@ -22,4 +24,4 @@
   <span class='hide analytics-event' data-category="file-set-in-collection" data-action="file-set-in-collection-view" data-name="<%= collection_id %>" >
 <% end %>
 <span class='hide analytics-event' data-category="file-set-in-work" data-action="file-set-in-work-view" data-name="<%= @presenter.parent.id %>" >
-<span class='hide analytics-event' data-category="file-set" data-action="file-set-view" data-name="<%= @presenter.id %>" >
+<span class='hide analytics-event' data-category="file-set" data-action="file-set-view" data-name="<%= @presenter.id %>" >

data/app/views/hyrax/homepage/_explore_collections.html.erb

@@ -23,7 +23,7 @@
 <ul class="list-inline collection-highlights-list">
   <li class="list-inline-item">
     <%= link_to t('hyrax.homepage.admin_sets.link'),
-                main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
+                main_app.search_catalog_path(f: { generic_type_sim: ["Collection"]}),
                 class: 'btn btn-secondary' %>
   </li>
 </ul>

data/app/views/hyrax/my/_search_form.html.erb

@@ -7,7 +7,7 @@
     </label>
 
     <div class="input-group mb-sm-auto col-sm-9">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -1,6 +1,6 @@
 <% if messages.present? %>
   <div class="table-responsive">
-    <table class="table table-striped datatable">
+    <table class="table table-striped datatable" data-order='[[0, "desc"]]'>
       <thead>
         <tr>
           <th><%= t('hyrax.mailbox.date') %></th>

data/app/views/hyrax/users/_vitals.html.erb

@@ -9,7 +9,7 @@
 
 <div class="list-group-item">
   <span class="badge dark-text"><%= number_of_works(user) %></span>
-  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
+  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_works(user) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

data/bin/dev-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+mkdir -p /app/samvera/hyrax-webapp/tmp/pids
+rm -f /app/samvera/hyrax-webapp/tmp/pids/*
+
+# Copy gems installed in the image to the dev bundle
+mkdir -p /app/bundle/ruby/$RUBY_MAJOR.0
+cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
+bundle install
+
+# Run the command
+exec "$@"

data/chart/hyrax/Chart.yaml

@@ -2,34 +2,38 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.1.0
+version: 3.5.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
-    version: 0.8.0
+    version: 1.0.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
-    version: 6.3.13
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 6.6.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: memcached.enabled
   - name: minio
-    version: 12.1.14
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 12.8.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: minio.enabled
   - name: postgresql
-    version: 12.2.5
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 12.9.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
   - name: redis
-    version: 17.8.7
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 17.16.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: redis.enabled
   - name: solr
-    version: 7.2.1
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 8.0.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: solr.enabled
   - name: nginx
-    version: 13.2.30
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: 15.2.0
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: nginx.enabled
+  - name: fits
+    version: 0.2.0
+    repository: https://samvera-labs.github.io/fits-charts
+    condition: fits.enabled

data/chart/hyrax/README.md

@@ -35,28 +35,30 @@ production environments.
 
 The chart populates the following environment variables:
 
-| Variable          | Description                    | Condition              |
-|-------------------|--------------------------------|------------------------|
-| DB_PASSWORD       | Postgresql password            | n/a                    |
-| DB_PORT           | Postgresql service port        | n/a                    |
-| DB_HOST           | Postgresql hostname            | n/a                    |
-| DB_USERNAME       | Postgresql username            | n/a                    |
-| MEMCACHED_HOST    | Memcached host                 | `memcached.enabled`    |
-| RACK_ENV          | app environment ('production') | n/a                    |
-| RAILS_ENV         | app environment ('production') | n/a                    |
-| REDIS_HOST        | Redis service host             | `redis.enabled`        |
-| FCREPO_BASE_PATH  | Fedora Commons root path       | n/a                    |
-| FCREPO_HOST       | Fedora Commons host            | n/a                    |
-| FCREPO_PORT       | Fedora Commons port            | n/a                    |
-| FCREPO_REST_PATH  | Fedora Commons REST endpoint   | n/a                    |
-| SKIP_HYRAX_ENGINE_SEED   | Flag to load Hyrax engine seed file | n/a                    |
-| SOLR_ADMIN_USER   | Solr user for basic auth       | n/a                    |
-| SOLR_ADMIN_PASSWORD | Solr password for basic auth | n/a                    |
-| SOLR_COLLECTION_NAME | The name of the solr collection to use | n/a         |
+| Variable          | Description                    | Condition                                |
+|-------------------|--------------------------------|------------------------------------------|
+| CH12N_TOOL        | Tool for characterization      | `fits.enabled` or `externalFits.enabled` |
+| DB_PASSWORD       | Postgresql password            | n/a                                      |
+| DB_PORT           | Postgresql service port        | n/a                                      |
+| DB_HOST           | Postgresql hostname            | n/a                                      |
+| DB_USERNAME       | Postgresql username            | n/a                                      |
+| MEMCACHED_HOST    | Memcached host                 | `memcached.enabled`                      |
+| RACK_ENV          | app environment ('production') | n/a                                      |
+| RAILS_ENV         | app environment ('production') | n/a                                      |
+| REDIS_HOST        | Redis service host             | `redis.enabled`                          |
+| FCREPO_BASE_PATH  | Fedora Commons root path       | n/a                                      |
+| FCREPO_HOST       | Fedora Commons host            | n/a                                      |
+| FCREPO_PORT       | Fedora Commons port            | n/a                                      |
+| FCREPO_REST_PATH  | Fedora Commons REST endpoint   | n/a                                      |
+| FITS_SERVLET_URL  | URL for FITS servlet           | `fits.enabled` or `externalFits.enabled` |
+| SKIP_HYRAX_ENGINE_SEED   | Flag to load Hyrax engine seed file | n/a                          |
+| SOLR_ADMIN_USER   | Solr user for basic auth       | n/a                                      |
+| SOLR_ADMIN_PASSWORD | Solr password for basic auth | n/a                                      |
+| SOLR_COLLECTION_NAME | The name of the solr collection to use | n/a                           |
 | SOLR_CONFIGSET_NAME | The name of the solr configset to use for config management tasks | n/a |
-| SOLR_HOST         | Solr service host              | n/a                    |
-| SOLR_PORT         | Solr service port              | n/a                    |
-| SOLR_URL          | Solr service full URL          | n/a                    |
+| SOLR_HOST         | Solr service host              | n/a                                      |
+| SOLR_PORT         | Solr service port              | n/a                                      |
+| SOLR_URL          | Solr service full URL          | n/a                                      |
 
 ## With an external SolrCloud
 
@@ -89,6 +91,17 @@ To use an existing or external `fcrepo` instance, use the chart values:
   - `fcrepo.enabled`: false
   - `externalFcrepoHost`: "myfedora.hostname.example.com"
 
+
+# Optional Fits Service
+
+Running fits as a servlet will result in much faster fits responses. This is because the loading cost of the
+various Java components far out weighs the processing time of those components.
+
+To enable fits as a service:
+
+  - ``fits.enabled: true` or `externalFits.enabled: true` and specify the
+    existing `externalFits.url`
+
 ## For DevOps:
 
 For those interested in trying out or contributing to this Chart, it's helpful

data/chart/hyrax/templates/_helpers.tpl

@@ -86,6 +86,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+
+{{/*
+Create default fully qualified service names.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "hyrax.fits.fullname" -}}
+{{- printf "%s-%s" .Release.Name "fits" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "hyrax.fits.host" -}}
+{{- if .Values.fits.enabled }}
+{{- include "hyrax.fits.fullname" . }}
+{{- else }}
+{{- .Values.externalFitsHost | default "NO_FITS_HOST_DEFINED" }}
+{{- end }}
+{{- end -}}
+
 {{- define "hyrax.memcached.fullname" -}}
 {{- printf "%s-%s" .Release.Name "memcached" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -130,6 +147,18 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+{{- define "hyrax.postgresql.port" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.postgresql.containerPorts.postgresql | default 5432 }}
+{{- else }}
+{{- .Values.externalPostgresql.port | default 5432 }}
+{{- end }}
+{{- end -}}
+
+{{- define "hyrax.postgresql.url" -}}
+{{- printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) -}}
+{{- end -}}
+
 {{- define "hyrax.redis.fullname" -}}
 {{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -172,7 +201,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "hyrax.solr.port" -}}
-{{- .Values.externalSolrPort | default "8983" }}
+{{- if .Values.solr.enabled }}
+{{- .Values.solr.containerPorts.http | default 8983 }}
+{{- else }}
+{{- .Values.externalSolrPort }}
+{{- end }}
 {{- end -}}
 
 {{- define "hyrax.solr.url" -}}

data/chart/hyrax/templates/configmap-env.yaml

@@ -8,8 +8,13 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
+  {{- if (or .Values.fits.enabled .Values.externalFits.enabled) }}
+  CH12N_TOOL: "fits_servlet"
+  {{- else }}
+  CH12N_TOOL: "fits"
+  {{- end }}
   DB_HOST: {{ template "hyrax.postgresql.host" . }}
-  DB_PORT: "5432"
+  DB_PORT: {{ include "hyrax.postgresql.port" . | quote }}
   DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}
@@ -29,6 +34,11 @@ data:
   FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_PORT: {{ .Values.fcrepo.servicePort | default 8080 | quote }}
   FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
+  {{- if .Values.fits.enabled }}
+  FITS_SERVLET_URL: http://{{ template "hyrax.fits.host" . }}:{{ .Values.fits.servicePort | default 8080 }}{{ .Values.fits.subPath | default "/fits" }}
+  {{- else if .Values.externalFits.enabled }}
+  FITS_SERVLET_URL: {{ .Values.externalFits.url }}
+  {{- end }}
   REDIS_PROVIDER: SIDEKIQ_REDIS_URL
   {{- if .Values.minio.enabled }}
   MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}
@@ -38,5 +48,5 @@ data:
   SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
   SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
   SOLR_HOST: {{ template "hyrax.solr.host" . }}
-  SOLR_PORT: {{ (include "hyrax.solr.port" .) | quote }}
+  SOLR_PORT: {{ include "hyrax.solr.port" . | quote}}
   SOLR_URL: {{ template "hyrax.solr.url" . }}

data/chart/hyrax/templates/secrets.yaml

@@ -8,7 +8,7 @@ type: Opaque
 data:
   SECRET_KEY_BASE: {{ randAlphaNum 20 | b64enc | quote }}
   DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
-  DATABASE_URL: {{ printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) | b64enc }}
+  DATABASE_URL: {{ include "hyrax.postgresql.url" . | b64enc }}
   {{- if .Values.minio.enabled }}
   MINIO_ACCESS_KEY: {{ .Values.minio.auth.rootUser | b64enc}}
   MINIO_SECRET_KEY: {{ .Values.minio.auth.rootPassword | b64enc}}