hyrax 5.0.0.rc2 → 5.0.0.rc3

data/lib/generators/hyrax/install_generator.rb

@@ -26,13 +26,14 @@ module Hyrax
      * Generates mailboxer
   10. Adds Hyrax's abilities into the Ability class
   11. Adds controller behavior to the application controller
-  12. Copies the catalog controller into the local app
-  13. Installs hyrax assets
-  14. Updates simple_form to use browser validations
-  15. Installs Blacklight gallery (and removes it's scss)
-  16. Install jquery-datatables
-  17. Initializes the noid-rails database-backed minter
-  18. Generates RIIIF image server implementation
+  12. Adds listener template and publisher initializer
+  13. Copies the catalog controller into the local app
+  14. Installs hyrax assets
+  15. Updates simple_form to use browser validations
+  16. Installs Blacklight gallery (and removes it's scss)
+  17. Install jquery-datatables
+  18. Initializes the noid-rails database-backed minter
+  19. Generates RIIIF image server implementation
          """
 
     def run_required_generators
@@ -109,6 +110,12 @@ module Hyrax
       end
     end
 
+    # add listener code to provide developers a hint that listening to events
+    # is a good development pattern
+    def inject_listeners
+      generate "hyrax:listeners"
+    end
+
     # Add behaviors to the application controller
     def inject_hyrax_application_controller_behavior
       file_path = "app/controllers/application_controller.rb"
@@ -134,6 +141,12 @@ module Hyrax
       generate 'qa:local:tables'
     end
 
+    def inject_required_seeds
+      insert_into_file 'db/seeds.rb' do
+        'Hyrax::RequiredDataSeeder.new.generate_seed_data'
+      end
+    end
+
     def install_assets
       generate "hyrax:assets"
     end
@@ -175,9 +188,26 @@ module Hyrax
       generate 'hyrax:riiif' unless options[:'skip-riiif']
     end
 
+    def insert_env_queue_adapter
+      insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$/ do
+        "\n    config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE') { 'async' }.to_sym\n"
+      end
+    end
+
     def universalviewer_files
       rake('hyrax:universal_viewer:install')
       rake('yarn:install')
     end
+
+    def lando
+      copy_file '.lando.yml'
+    end
+
+    def dotenv
+      copy_file '.env'
+      gem_group :development, :test do
+        gem 'dotenv-rails', '~> 2.8'
+      end
+    end
   end
 end

data/lib/generators/hyrax/listeners_generator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'rails/generators'
+
+class Hyrax::ListenersGenerator < Rails::Generators::Base
+  desc """
+    This generator adds templates for Hyrax::Publisher listeners to your application
+       """
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  def inject_listener
+    copy_file 'app/listeners/hyrax_listener.rb', 'app/listeners/hyrax_listener.rb'
+  end
+
+  def inject_listener_initialier
+    copy_file 'config/initializers/publisher.rb', 'config/initializers/publisher.rb'
+  end
+end

data/lib/generators/hyrax/models_generator.rb

@@ -15,6 +15,7 @@ class Hyrax::ModelsGenerator < Rails::Generators::Base
   # Setup the database migrations
   def copy_migrations
     rake 'hyrax:install:migrations'
+    rake 'valkyrie_engine:install:migrations'
   end
 
   # Add behaviors to the user model
@@ -36,16 +37,6 @@ class Hyrax::ModelsGenerator < Rails::Generators::Base
   end
   # rubocop:enable Metrics/MethodLength
 
-  def create_collection
-    copy_file 'app/models/collection.rb', 'app/models/collection.rb'
-    copy_file 'spec/models/collection_spec.rb', 'spec/models/collection_spec.rb' if rspec_installed?
-  end
-
-  def create_file_set
-    copy_file 'app/models/file_set.rb', 'app/models/file_set.rb'
-    copy_file 'spec/models/file_set_spec.rb', 'spec/models/file_set_spec.rb' if rspec_installed?
-  end
-
   # Adds clamav initializtion
   def clamav
     generate 'hyrax:clamav'

data/lib/generators/hyrax/riiif_generator.rb

@@ -18,10 +18,6 @@ class Hyrax::RiiifGenerator < Rails::Generators::Base
 
   def add_to_gemfile
     gem 'riiif', '~> 2.1'
-
-    Bundler.with_clean_env do
-      run "bundle install"
-    end
   end
 
   def copy_initializer
@@ -32,6 +28,12 @@ class Hyrax::RiiifGenerator < Rails::Generators::Base
     route "mount Riiif::Engine => 'images', as: :riiif if Hyrax.config.iiif_image_server?"
   end
 
+  def enable_riiif_in_hyrax_config
+    insert_into_file 'config/initializers/hyrax.rb', before: /^  # config.iiif_image_server = false/ do
+      "  config.iiif_image_server = true\n"
+    end
+  end
+
   def override_image_url_builder_in_hyrax_config
     insert_into_file 'config/initializers/hyrax.rb', before: /^  # config.iiif_image_url_builder/ do
       "  config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|\n" \

data/lib/generators/hyrax/templates/.env

@@ -0,0 +1,9 @@
+CH12N_TOOL=fits_servlet
+DATABASE_URL=postgresql://postgres@localhost:5437/hyrax-dev?pool=5
+FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8989/fcrepo/rest
+FITS_SERVLET_URL=http://localhost:8085/fits
+HYRAX_ACTIVE_JOB_QUEUE=async
+REDIS_URL=redis://localhost:6384
+SOLR_URL=http://localhost:8988/solr/hyrax-dev
+VALKYRIE_METADATA_ADAPTER=pg_metadata
+VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage

data/lib/generators/hyrax/templates/.lando.yml

@@ -0,0 +1,50 @@
+name: hyrax-app
+app_mount: false
+services:
+  solr:
+    app_mount: false
+    type: solr:8
+    portforward: 8988
+    core: hyrax-dev
+    config:
+      dir: solr/conf
+  database:
+    app_mount: false
+    type: postgres:15
+    portforward: 5437
+    creds:
+      database: hyrax-dev
+  redis:
+    app_mount: false
+    type: redis:6
+    portforward: 6384
+    persist: true
+  fits:
+    api: 3
+    type: lando
+    app_mount: false
+    services:
+      image: ghcr.io/samvera/fitsservlet:1.6.0
+      command:
+        - "catalina.sh"
+        - "run"
+      ports:
+        - 8085:8080
+#  fedora:
+#    api: 3
+#    type: lando
+#    app_mount: false
+#    volumes:
+#      fedora6:
+#    services:
+#      image: fcrepo/fcrepo:6.4.0
+#      command:
+#        - "catalina.sh"
+#        - "run"
+#      volumes:
+#        - fedora6:/data
+#      ports:
+#        - 8989:8080
+#      environment:
+#        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+#        JAVA_OPTS: "-Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"

data/lib/generators/hyrax/templates/app/listeners/hyrax_listener.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+##
+# Generated by hyrax:listeners
+#
+# The Hyrax engine uses a publish/subscribe programming model to allow
+# pluggable behavior in response to certain repository events. A range of events
+# are published on a topic based event bus.
+#
+# This listener provides a template.
+#
+# For simple use cases, it's fine to add behavior to the `#on_*` methods in this
+# Listener. If you have more than trivial behavior here, you probably want to add
+# new classes that are named narrowly scoped and named for what the listener is
+# for.
+#
+# When writing listener methods, it's important to carefully consider error,
+# handling. Unhandled exceptions short-circuit behavior for other listeners,
+# so it's a good idea to be paying attention to failure cases.
+#
+# @see https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
+# @see https://www.rubydoc.info/gems/hyrax/Hyrax/Publisher
+# @see https://dry-rb.org/gems/dry-events
+class HyraxListener
+  # def on_batch_created
+  # end
+
+  # def on_collection_deleted
+  # end
+
+  # def on_collection_metadata_updated
+  # end
+
+  # def on_collection_membership_update
+  # end
+
+  # def on_file_characterized
+  # end
+
+  # def on_file_downloaded
+  # end
+
+  # def on_file_metadata_updated
+  # end
+
+  # def on_file_metadata_deleted
+  # end
+
+  # def on_file_uploaded
+  # end
+
+  # def on_file_set_audited
+  # end
+
+  # def on_file_set_attached
+  # end
+
+  # def on_file_set_url_imported
+  # end
+
+  # def on_file_set_restored
+  # end
+
+  # def on_object_deleted
+  # end
+
+  # def on_object_failed_deposit
+  # end
+
+  # def on_object_deposited
+  # end
+
+  # def on_object_acl_updated
+  # end
+
+  # def on_object_membership_updated
+  # end
+
+  # def on_object_metadata_updated
+  # end
+end

data/lib/generators/hyrax/templates/app/models/file_set.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 # Generated by hyrax:models:install
-class FileSet < ActiveFedora::Base
-  include ::Hyrax::FileSetBehavior
+class FileSet < Hyrax::FileSet
 end

data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+require 'faraday/multipart'
+
+# require "shrine/storage/s3"
+# require "valkyrie/storage/shrine"
+# require "valkyrie/shrine/checksum/s3"
+
+# database = ENV.fetch("METADATA_DB_NAME", "nurax_pg_metadata")
+# Rails.logger.info "Establishing connection to postgresql on: " \
+#                   "#{ENV["DB_HOST"]}:#{ENV["DB_PORT"]}.\n" \
+#                   "Using database: #{database}."
+# connection = Sequel.connect(
+#   user: ENV["DB_USERNAME"],
+#   password: ENV["DB_PASSWORD"],
+#   host: ENV["DB_HOST"],
+#   port: ENV["DB_PORT"],
+#   database: database,
+#   max_connections: ENV.fetch("DB_POOL", 5),
+#   pool_timeout: ENV.fetch("DB_TIMEOUT", 5000),
+#   adapter: :postgres
+# )
+#
+# Valkyrie::MetadataAdapter
+#   .register(Valkyrie::Sequel::MetadataAdapter.new(connection: connection),
+#             :nurax_pg_metadata_adapter)
+Valkyrie::MetadataAdapter.register(
+  Valkyrie::Persistence::Postgres::MetadataAdapter.new,
+  :pg_metadata
+)
+
+# Fedora metadata adapter
+# Valkyrie::MetadataAdapter.register(
+#   Valkyrie::Persistence::Fedora::MetadataAdapter.new(
+#     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
+#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#     )),
+#     base_path: Rails.env,
+#     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
+#     fedora_version: 6
+#   ), :fedora_metadata
+# )
+
+Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_metadata }.to_sym
+
+# shrine_s3_options = {
+#   bucket: ENV.fetch("REPOSITORY_S3_BUCKET") { "nurax_pg#{Rails.env}" },
+#   region: ENV.fetch("REPOSITORY_S3_REGION", "us-east-1"),
+#   access_key_id: (ENV["REPOSITORY_S3_ACCESS_KEY"] || ENV["MINIO_ACCESS_KEY"]),
+#   secret_access_key: (ENV["REPOSITORY_S3_SECRET_KEY"] || ENV["MINIO_SECRET_KEY"])
+# }
+#
+# if ENV["MINIO_ENDPOINT"].present?
+#   shrine_s3_options[:endpoint] = "http://#{ENV["MINIO_ENDPOINT"]}:#{ENV.fetch("MINIO_PORT", 9000)}"
+#   shrine_s3_options[:force_path_style] = true
+# end
+#
+# Valkyrie::StorageAdapter.register(
+#   Valkyrie::Storage::Shrine.new(Shrine::Storage::S3.new(**shrine_s3_options)),
+#   :repository_s3
+# )
+#
+# Valkyrie.config.storage_adapter = :repository_s3
+
+# Fedora storage adapter
+# Valkyrie::StorageAdapter.register(
+#   Valkyrie::Storage::Fedora.new(
+#     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
+#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#     )),
+#     base_path: Rails.env,
+#     fedora_version: 6
+#   ), :fedora_storage
+# )
+
+Valkyrie::StorageAdapter.register(
+  Valkyrie::Storage::VersionedDisk.new(base_path: Rails.root.join("storage", "files"),
+                                       file_mover: FileUtils.method(:cp)),
+  :versioned_disk_storage
+)
+
+Valkyrie.config.storage_adapter  = ENV.fetch('VALKYRIE_STORAGE_ADAPTER') { :versioned_disk_storage }.to_sym
+
+Valkyrie.config.indexing_adapter = :solr_index
+
+custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
+                  Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
+                  Hyrax::CustomQueries::Navigators::FindFiles,
+                  Hyrax::CustomQueries::FindAccessControl,
+                  Hyrax::CustomQueries::FindCollectionsByType,
+                  Hyrax::CustomQueries::FindFileMetadata,
+                  Hyrax::CustomQueries::FindIdsByModel,
+                  Hyrax::CustomQueries::FindManyByAlternateIds,
+                  Hyrax::CustomQueries::FindModelsByAccess,
+                  Hyrax::CustomQueries::FindCountBy,
+                  Hyrax::CustomQueries::FindByDateRange]
+custom_queries.each do |handler|
+  Hyrax.query_service.custom_queries.register_query_handler(handler)
+end

data/lib/generators/hyrax/templates/config/initializers/file_services.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -59,7 +59,7 @@ Hyrax.config do |config|
 
   # Hyrax uses NOIDs for files and collections instead of Fedora UUIDs
   # where NOID = 10-character string and UUID = 32-character string w/ hyphens
-  # config.enable_noids = true
+  config.enable_noids = false
 
   # Template for your repository's NOID IDs
   # config.noid_template = ".reeddeeddk"
@@ -235,20 +235,56 @@ Hyrax.config do |config|
   # Identify the model class name that will be used for Collections in your app
   # (i.e. ::Collection for ActiveFedora, Hyrax::PcdmCollection for Valkyrie)
   # config.collection_model = '::Collection'
-  # config.collection_model = 'Hyrax::PcdmCollection'
+  config.collection_model = 'Hyrax::PcdmCollection'
 
   # Identify the model class name that will be used for Admin Sets in your app
   # (i.e. AdminSet for ActiveFedora, Hyrax::AdministrativeSet for Valkyrie)
   # config.admin_set_model = 'AdminSet'
-  # config.admin_set_model = 'Hyrax::AdministrativeSet'
+  config.admin_set_model = 'Hyrax::AdministrativeSet'
+
+  # Identify the form that will be used for Admin Sets
+  # config.administrative_set_form = Hyrax::Forms::AdministrativeSetForm
+
+  # Identify the indexer that will be used for Admin Sets
+  # config.administrative_set_indexer = Hyrax::Indexers::AdministrativeSetIndexer
+
+  # Identify the form that will be used for File Sets
+  # config.file_set_form = Hyrax::Forms::FileSetForm
+
+  # Identify the indexer that will be used for File Sets
+  # config.file_set_indexer = Hyrax::Indexers::FileSetIndexer
+
+  # Service for resolving {FileMetadata} nodes by status, e.g. "primary", rather
+  # than use.
+  # config.file_set_file_service = Hyrax::FileSetFileService
+
+  # Identify the form that will be used for Collections
+  # config.pcdm_collection_form = Hyrax::Forms::PcdmCollectionForm
+
+  # Identify the indexer that will be used for Collections
+  # config.pcdm_collection_indexer = Hyrax::Indexers::PcdmCollectionIndexer
+
+  # Provide a proc for form generation for Objects
+  # config.pcdm_object_form_builder = lambda do |model_class|
+  #   Hyrax::Forms::PcdmObjectForm(model_class)
+  # end
+
+  # Provide a proc for indexer generation for Objects
+  # config.pcdm_object_indexer_builder = lambda do |model_class|
+  #   Hyrax::Indexers::PcdmObjectIndexer(model_class)
+  # end
+
+  ## Enable Valkyrie only mode
+  config.use_valkyrie = true
+  config.disable_wings true
 
   # When your application is ready to use the valkyrie index instead of the one
   # maintained by active fedora, you will need to set this to true. You will
   # also need to update your Blacklight configuration.
-  # config.query_index_from_valkyrie = false
+  config.query_index_from_valkyrie = true
 
   ## Configure index adapter for Valkyrie::Resources to use solr readonly indexer
-  # config.index_adapter = :solr_index
+  config.index_adapter = :solr_index
 
   ## Fedora import/export tool
   #

data/lib/generators/hyrax/templates/config/initializers/publisher.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Hyrax.publisher.subscribe(HyraxListener.new)

data/lib/generators/hyrax/templates/config/initializers/riiif.rb

@@ -31,3 +31,80 @@ Rails.application.reloader.to_prepare do
 
   Riiif::Engine.config.cache_duration = 1.month
 end
+
+module Hyrax
+  # Adds file locking to Riiif::File
+  # @see RiiifFileResolver
+  class RiiifFile < Riiif::File
+    include ActiveSupport::Benchmarkable
+
+    attr_reader :id
+    def initialize(input_path, tempfile = nil, id:)
+      super(input_path, tempfile)
+      raise(ArgumentError, "must specify id") if id.blank?
+      @id = id
+    end
+
+    # Wrap extract in a read lock and benchmark it
+    def extract(transformation, image_info = nil)
+      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+          super
+        end
+      end
+    end
+
+    private
+
+    def logger
+      Hyrax.logger
+    end
+  end
+
+  class RiiifFileResolver
+    include ActiveSupport::Benchmarkable
+
+    # @param [String] id from iiif manifest
+    # @return [Riiif::File]
+    def find(id)
+      path = nil
+      file_locks[id].with_write_lock do
+        path = build_path(id)
+        path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
+      end
+      RiiifFile.new(path, id: id)
+    end
+
+    # tracks individual file locks
+    # @see RiiifFile
+    # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
+    def file_locks
+      @file_locks ||= Concurrent::Map.new do |k, v|
+        k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
+      end
+    end
+
+    private
+
+    def build_path(id, force: false)
+      Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
+                               expires_in: Riiif::Image.expires_in,
+                               force: force) do
+        load_file(id)
+      end
+    end
+
+    def load_file(id)
+      benchmark "RiiifFileResolver loaded #{id}", level: :debug do
+        fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+        file_set = Hyrax.query_service.find_by(id: fs_id)
+        file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
+        file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
+      end
+    end
+
+    def logger
+      Hyrax.logger
+    end
+  end
+end

data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml

@@ -50,7 +50,7 @@ de:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
       service_html: Ein Dienst von <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Name des Instituts

data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml

@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -50,7 +50,7 @@ es:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> bajo licencia de Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> bajo licencia de Apache, Version 2.0"
       service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: institución
     institution_name_full: El nombre de la institución

data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml

@@ -50,7 +50,7 @@ fr:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licence sous Licence Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licence sous Licence Apache, Version 2.0"
       service_html: Un service de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Nom de l'établissement

data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml

@@ -50,7 +50,7 @@ it:
     directory:
       suffix: "@ example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
       service_html: Un servizio di <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Istituzione
     institution_name_full: Nome dell'Istituzione

data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml

@@ -50,7 +50,7 @@ pt-BR:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
       service_html: Um serviço de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Instituição
     institution_name_full: O Nome da Instituição

data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml

@@ -50,7 +50,7 @@ zh:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>版权所有 &copy; 2022 Samvera</strong> 根据Apache许可证2.0版许可"
+      copyright_html: "<strong>版权所有 &copy; %{current_year} Samvera</strong> 根据Apache许可证2.0版许可"
       service_html: 的服务<a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: 机构
     institution_name_full: 机构名称

data/lib/generators/hyrax/templates/config/redis.yml

@@ -1,9 +1,6 @@
 development:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>
 test:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>
 production:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>

data/lib/generators/hyrax/templates/config/valkyrie_index.yml

@@ -1,12 +1,7 @@
+# This is a sample config file that points to a solr server for each environment
 development:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-dev' %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %>
 test:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-test' %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
 production:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] %>
+  url: <%= ENV['SOLR_URL'] || "http://your.production.server:8080/bl_solr/core0" %>