hyrax 3.4.1 → 3.5.0

data/chart/hyrax/templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "hyrax.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcFullName := ternary (include "hyrax.nginx.host" .) (include "hyrax.fullname" .) .Values.nginx.enabled -}}
+{{- $svcPort := ternary .Values.nginx.service.port .Values.service.port .Values.nginx.enabled -}}
+
 {{- $beta := semverCompare "<1.19-0" (default .Capabilities.KubeVersion.Version .Values.kubeVersion) -}}
 {{- if $beta }}
 apiVersion: networking.k8s.io/v1beta1
@@ -9,7 +10,7 @@ apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "hyrax.fullname" . }}
   labels:
     {{- include "hyrax.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -37,14 +38,14 @@ spec:
             pathType: {{ .pathType | default "ImplementationSpecific" }}
             backend:
               {{- if $beta }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ $svcFullName }}
               servicePort: {{ $svcPort }}
               {{- else }}
               service:
-                name: {{ $fullName }}
+                name: {{ $svcFullName }}
                 port:
                   number: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}
-  {{- end }}
+{{- end }}

data/chart/hyrax/values.yaml

@@ -201,6 +201,18 @@ worker:
   affinity: {}
   resources: {}
 
+  # see: https://github.com/mperham/sidekiq/wiki/Kubernetes#health-checks
+  readinessProbe:
+    enabled: false
+    # command:
+    #  - cat
+    #  - /app/samvera/hyrax-webapp/tmp/sidekiq_process_has_started_and_will_begin_processing_jobs
+    # initialDelaySeconds: 10
+    # periodSeconds: 2
+    # timeoutSeconds: 1
+    # failureThreshold: 10
+    # successThreshold: 2
+
 fcrepo:
   enabled: true
   externalDatabaseUsername: "hyrax"
@@ -238,6 +250,144 @@ postgresql:
   # persistence:
   #   size: 10Gi
 
+
+## Nginx proxy is used to keep puma from having to serve static assets
+## and to act as an auth proxy for Cantelope
+nginx:
+  enabled: false
+  # The set up below does malicious bot / ip blocking and mounts
+  # vaolumes to allow nginx to server assets and other public directory items
+  # image:
+  #   registry: registry.gitlab.com
+  #   repository: notch8/scripts/bitnami-nginx
+  #   tag: 1.21.5-debian-10-r4
+  # extraVolumes:
+  #   - name: "uploads"
+  #     persistentVolumeClaim:
+  #       claimName: {{ .Values.global.hyraxHostName }}-uploads
+  # extraVolumeMounts:
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/system
+  #     subPath: public-system
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uploads
+  #     subPath: public-uploads
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uv
+  #     subPath: public-uv
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/assets
+  #     subPath: public-assets
+  # serverBlock: |-
+  #   upstream rails_app {
+  #     server {{ .Values.global.hyraxHostName }};
+  #   }
+
+  #   map $status $loggable {
+  #       ~^444  0;
+  #       default 1;
+  #   }
+
+  #   log_format loki 'host=$host ip=$http_x_forwarded_for remote_user=$remote_user [$time_local] '
+  #                     'request="$request" status=$status bytes=$body_bytes_sent '
+  #                     'referer="$http_referer" agent="$http_user_agent" request_time=$request_time upstream_response_time=$upstream_response_time upstream_response_length=$upstream_response_length';
+
+  #   error_log  /opt/bitnami/nginx/logs/error.log warn;
+  #   #tcp_nopush     on;
+
+  #   # Cloudflare ips see for refresh
+  #   # https://support.cloudflare.com/hc/en-us/articles/200170786-Restoring-original-visitor-IPs-logging-visitor-IP-addresses
+  #   # update list https://www.cloudflare.com/ips/
+  #   set_real_ip_from 103.21.244.0/22;
+  #   set_real_ip_from 103.22.200.0/22;
+  #   set_real_ip_from 103.31.4.0/22;
+  #   set_real_ip_from 104.16.0.0/13;
+  #   set_real_ip_from 104.24.0.0/14;
+  #   set_real_ip_from 108.162.192.0/18;
+  #   set_real_ip_from 131.0.72.0/22;
+  #   set_real_ip_from 141.101.64.0/18;
+  #   set_real_ip_from 162.158.0.0/15;
+  #   set_real_ip_from 172.64.0.0/13;
+  #   set_real_ip_from 173.245.48.0/20;
+  #   set_real_ip_from 188.114.96.0/20;
+  #   set_real_ip_from 190.93.240.0/20;
+  #   set_real_ip_from 197.234.240.0/22;
+  #   set_real_ip_from 198.41.128.0/17;
+  #   set_real_ip_from 2400:cb00::/32;
+  #   set_real_ip_from 2606:4700::/32;
+  #   set_real_ip_from 2803:f800::/32;
+  #   set_real_ip_from 2405:b500::/32;
+  #   set_real_ip_from 2405:8100::/32;
+  #   set_real_ip_from 2a06:98c0::/29;
+  #   set_real_ip_from 2c0f:f248::/32;
+
+  #   real_ip_header X-Forwarded-For;
+  #   real_ip_recursive on;
+  #   include /opt/bitnami/nginx/conf/conf.d/*.conf;
+  #   server {
+  #       listen 8080;
+  #       server_name _;
+  #       root /app/samvera/hyrax-webapp/public;
+  #       index index.html;
+
+  #       client_body_in_file_only clean;
+  #       client_body_buffer_size 32K;
+  #       client_max_body_size 0;
+  #       access_log /opt/bitnami/nginx/logs/access.log loki;
+  #       # if=$loggable;
+
+  #       sendfile on;
+  #       send_timeout 300s;
+
+  #       include /opt/bitnami/nginx/conf/bots.d/ddos.conf;
+  #       include /opt/bitnami/nginx/conf/bots.d/blockbots.conf;
+
+  #       location ~ (\.php|\.aspx|\.asp) {
+  #       	return 404;
+  #       }
+
+  #       # deny requests for files that should never be accessed
+  #       location ~ /\. {
+  #         deny all;
+  #       }
+
+  #       location ~* ^.+\.(rb|log)$ {
+  #         deny all;
+  #       }
+
+  #       # serve static (compiled) assets directly if they exist (for rails production)
+  #       location ~ ^/(assets|packs|fonts|images|javascripts|stylesheets|swfs|system)/ {
+  #         try_files $uri @rails;
+
+  #         # access_log off;
+  #         gzip_static on; # to serve pre-gzipped version
+
+  #         expires max;
+  #         add_header Cache-Control public;
+
+  #         # Some browsers still send conditional-GET requests if there's a
+  #         # Last-Modified header or an ETag header even if they haven't
+  #         # reached the expiry date sent in the Expires header.
+  #         add_header Last-Modified "";
+  #         add_header ETag "";
+  #         break;
+  #       }
+
+  #       # send non-static file requests to the app server
+  #       location / {
+  #         try_files $uri @rails;
+  #       }
+
+  #       location @rails {
+  #         proxy_set_header  X-Real-IP  $remote_addr;
+  #         proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+  #         proxy_set_header Host $http_host;
+  #         proxy_redirect off;
+  #         proxy_pass http://rails_app;
+  #       }
+  #   }
+
+
 redis:
   enabled: true
   password: mysecret
@@ -273,6 +423,8 @@ global:
   postgresql:
     postgresqlUsername: hyrax
     postgresqlPassword: hyrax_pass
+  # This is th name of the running rails server pod
+  hyraxHostName: hyrax
 
 nodeSelector: {}
 

data/config/features.rb

@@ -1,53 +1,51 @@
 # frozen_string_literal: true
 Flipflop.configure do
-  begin
-    # Strategies will be used in the order listed here.
-    strategy :cookie
-    strategy :active_record, class: Hyrax::Feature
-    strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
-    strategy :default
-
-    feature :proxy_deposit,
-            default: true,
-            description: "Depositors may designate proxies to deposit works on their behalf"
-
-    feature :transfer_works,
-            default: true,
-            description: "Depositors may transfer their works to another user"
-
-    # Note, if this is deactivated, a default admin set will be created and all
-    # works will be assigned to it when they are created.
-    feature :assign_admin_set,
-            default: true,
-            description: "Ability to assign uploaded items to an admin set"
-
-    feature :show_deposit_agreement,
-            default: true,
-            description: "Show a deposit agreement to users creating works"
-
-    feature :active_deposit_agreement_acceptance,
-            default: Hyrax.config.active_deposit_agreement_acceptance?,
-            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-    feature :batch_upload,
-            default: false,
-            description: "Enable uploading batches of works"
-
-    feature :hide_private_items,
-            default: false,
-            description: "Do not show the private items."
-
-    feature :hide_users_list,
-            default: true,
-            description: "Do not show users list unless user has authenticated."
-
-    feature :cache_work_iiif_manifest,
-            default: false,
-            description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-    feature :read_only,
-            default: false,
-            description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
-  rescue Flipflop::StrategyError, Flipflop::FeatureError => err
-    Rails.logger.warn "Ignoring #{err}: #{err.message}"
-  end
+  # Strategies will be used in the order listed here.
+  strategy :cookie
+  strategy :active_record, class: Hyrax::Feature
+  strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
+  strategy :default
+
+  feature :proxy_deposit,
+          default: true,
+          description: "Depositors may designate proxies to deposit works on their behalf"
+
+  feature :transfer_works,
+          default: true,
+          description: "Depositors may transfer their works to another user"
+
+  # Note, if this is deactivated, a default admin set will be created and all
+  # works will be assigned to it when they are created.
+  feature :assign_admin_set,
+          default: true,
+          description: "Ability to assign uploaded items to an admin set"
+
+  feature :show_deposit_agreement,
+          default: true,
+          description: "Show a deposit agreement to users creating works"
+
+  feature :active_deposit_agreement_acceptance,
+          default: Hyrax.config.active_deposit_agreement_acceptance?,
+          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+  feature :batch_upload,
+          default: false,
+          description: "Enable uploading batches of works"
+
+  feature :hide_private_items,
+          default: false,
+          description: "Do not show the private items."
+
+  feature :hide_users_list,
+          default: true,
+          description: "Do not show users list unless user has authenticated."
+
+  feature :cache_work_iiif_manifest,
+          default: false,
+          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
+  feature :read_only,
+          default: false,
+          description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+rescue Flipflop::StrategyError, Flipflop::FeatureError => err
+  Rails.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb}

@@ -5,3 +5,8 @@ Valkyrie::StorageAdapter.register(
                               path_generator: Hyrax::ValkyrieSimplePathGenerator),
   :branding_disk
 )
+
+Valkyrie::StorageAdapter.register(
+  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path),
+  :derivatives_disk
+)

data/config/locales/hyrax.de.yml

@@ -220,7 +220,7 @@ de:
             summary: Zusammenfassung
             title: Sammlungsbericht
             view_collection_btn: Kollektion ansehen
-            visibility: Sichtweite
+            visibility: Sichtbarkeit
           summary:
             all_time: Alle Zeit
             collection_home_page_views: Aufrufe der Sammlungs-Startseite
@@ -239,7 +239,7 @@ de:
             export: Export
             file_downloads_in_collection: Dateiset-Downloads in dieser Sammlung
             top_collections: Top-Kollektionen
-            works_in_collection_views: Funktioniert in dieser Sammlungsansichten
+            works_in_collection_views: Arbeiten in dieser Sammlungsansichten
         date_range_form:
           date_range_heading: Datumsbereich anpassen
           end_date: Endtermin
@@ -270,7 +270,7 @@ de:
             summary: Zusammenfassung
             title: Werksbericht
             views: Ansichten
-            works: funktioniert
+            works: Arbeiten
           monthly_summary:
             file_downloads: Datei-Downloads
             monthly_subtitle: Monat für Monat Status für die letzten 12 Monate bis
@@ -285,7 +285,7 @@ de:
             summary: Zusammenfassung
             title: Arbeitsbericht
             view_work_btn: Arbeit ansehen
-            visibility: Sichtweite
+            visibility: Sichtbarkeit
             work_type: Arbeitstyp
           summary:
             all_time: Alle Zeit
@@ -310,7 +310,7 @@ de:
             work_title: Arbeitstitel
             work_views: Arbeitsseitenaufrufe
           work_counts:
-            child_works: Kind arbeitet
+            child_works: untergeordnete Arbeiten
             files: Dateien
             total_size: Gesamtgröße
           work_files:
@@ -408,7 +408,7 @@ de:
         collections_report: Sammlungsbericht
         configuration: Konfiguration
         content_blocks: Inhaltsblöcke
-        dashboard: Armaturenbrett
+        dashboard: Dashboard
         delete_all: Alles löschen
         notifications: Benachrichtigungen
         pages: Seiten
@@ -557,7 +557,7 @@ de:
           actions: Aktion
           title: Sammlungstitel
       form_permission:
-        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </ Small>
+        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </small>
       form_permission_under_embargo:
         help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
         legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
@@ -596,6 +596,7 @@ de:
         legend_html: Miniaturansicht
       form_visibility_component:
         visibility: Sichtbarkeit
+        subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
       inspect_work:
         back_to: Zurück zu
         entity_id: Mandanten-ID
@@ -976,7 +977,7 @@ de:
           remove_from_collection: Aus der Sammlung entfernen
           select_an_action: Wählen Sie eine Aktion aus
           transfer_ownership_of_work: Übertragen Sie das Eigentum an der Arbeit
-        works: Funktioniert
+        works: Arbeiten
       create_work: Arbeiten erstellen
       current_proxies: Aktuelle Vertreter
       delete_notification: Benachrichtigung löschen
@@ -1106,7 +1107,7 @@ de:
         objects: Objekte
         subtitle: Die letzten 90 Tage
         title: Repository-Wachstum
-        works: Funktioniert
+        works: Arbeiten
       repository_objects:
         status: Aktueller Status
         subtitle: Aktueller Status
@@ -1157,7 +1158,7 @@ de:
       user_notifications: Benutzerbenachrichtigungen
       view_files: Dateien ansehen
       visibility_graph:
-        visibility: Sichtweite
+        visibility: Sichtbarkeit
       work_type_graph:
         count: Zählen
         title: Arbeitstypen
@@ -1408,10 +1409,10 @@ de:
           you_manage: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository verwalten können"
           you_own: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository besitzen"
         works:
-          in_repo: "<strong> %{total_count} funktioniert </ strong> im Repository"
+          in_repo: "<strong> %{total_count} Arbeiten </ strong> im Repository"
           works_listing: Auflistung der Arbeiten
-          you_manage: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository besitzen"
+          you_manage: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository besitzen"
       sort_and_per_page:
         number_of_results_to_display_per_page: Anzahl der anzuzeigenden Ergebnisse pro Seite
     nav_safety:

data/config/locales/hyrax.en.yml

@@ -588,6 +588,7 @@ en:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibility
+        subtitle_html: <small>Who should be able to view or download this content?</small>
       inspect_work:
         back_to: Back to
         entity_id: Entity ID
@@ -1687,6 +1688,8 @@ en:
         note_html: Keep to myself with option to share.
         text: Private
       restricted_title_attr: Change the visibility of this resource
+      unknown:
+        text: Unknown
     work_button_row:
       attach_child: Attach Child
     workflow:

data/config/locales/hyrax.es.yml

@@ -601,6 +601,7 @@ es:
         legend_html: Miniatura
       form_visibility_component:
         visibility: La visibilidad
+        subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
       inspect_work:
         back_to: De regreso
         entity_id: ID de entidad

data/config/locales/hyrax.fr.yml

@@ -563,7 +563,7 @@ fr:
           actions: action
           title: Titre de la collection
       form_permission:
-        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </ Small>
+        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
       form_permission_under_embargo:
         help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
         legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
@@ -602,6 +602,7 @@ fr:
         legend_html: La vignette
       form_visibility_component:
         visibility: Visibilité
+        subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
       inspect_work:
         back_to: Retour à
         entity_id: ID d'entité

data/config/locales/hyrax.it.yml

@@ -601,6 +601,7 @@ it:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibilità
+        subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
       inspect_work:
         back_to: Torna a
         entity_id: ID entità

data/config/locales/hyrax.pt-BR.yml

@@ -596,6 +596,7 @@ pt-BR:
         legend_html: Miniatura
       form_visibility_component:
         visibility: Visibilidade
+        subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
       inspect_work:
         back_to: De volta a
         entity_id: ID da entidade

data/config/locales/hyrax.zh.yml

@@ -599,6 +599,7 @@ zh:
         legend_html: 缩略图
       form_visibility_component:
         visibility: 可见性
+        subtitle_html: <small>谁应该能够查看或下载此内容？</ small>
       inspect_work:
         back_to: 回到
         entity_id: 实体ID

data/config/metadata/file_set_metadata.yaml

@@ -0,0 +1,130 @@
+# This is the metadata used for `Hyrax::FileSet`s.` It is similar to
+# `basic_metadata.yaml`, but not exactly the same.
+#
+# Terms which are already present in `core_metadata.yaml` are not repeated here.
+attributes:
+  # Required attributes:
+  creator:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+    index_keys:
+      - "creator_tesim"
+  license:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+
+  # Other attributes:
+  abstract:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  # missing: access_right
+  # missing: alternative_title
+  based_near:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "based_near_sim"
+      - "based_near_tesim"
+  # missing: bibliograpic_citation
+  contributor:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: creator
+  date_created:
+    type: date_time
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "date_created_tesim"
+  description:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "description_tesim"
+  identifier:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # missing: import_url
+  keyword:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "keyword_sim"
+      - "keyword_tesim"
+  # missing: publisher
+  label:
+    type: string
+  # form:
+  #   primary: false
+  language:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: license
+  publisher:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  related_url:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "related_url_tesim"
+  relative_path:
+    type: string
+  resource_type:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+    index_keys:
+      - "resource_type_sim"
+      - "resource_type_tesim"
+  rights_notes:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  rights_statement:
+    type: string
+    multiple: true
+  # form:
+  #   primary: true
+    index_keys:
+      - "rights_statement_tesim"
+  source:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  subject:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "subject_sim"
+      - "subject_tesim"

data/docker-compose.yml

@@ -74,6 +74,7 @@ services:
     user: root
     env_file:
       - .env
+      - .dassie/.env
     command: sh -l -c 'bundle && db-migrate-seed.sh'
     depends_on:
       - postgres

data/documentation/developing-your-hyrax-based-app.md

@@ -109,7 +109,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.2.6
+gem install rails -v 5.2.8.1
 ```
 
 ### JavaScript runtime
@@ -125,7 +125,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.4.1/template.rb
+rails _5.2.8.1_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.5.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including: