Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make iiif_print and s3 backed valkyrie storage play nicely together #2378

Merged
merged 2 commits into from
Nov 7, 2024
Merged

make iiif_print and s3 backed valkyrie storage play nicely together #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40b16a8
make iiif_print and s3 backed valkyrie storage play nicely together
orangewolf Nov 7, 2024
c932963
Update Gemfile.lock
orangewolf Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ GIT

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
revision: 9c4783a8301c645b04f062a3e4ca4d3e8cdefc33
revision: a1905e2f5ce9598c4a743eedeaa7a7ee54cb4ce4
branch: main
specs:
iiif_print (3.0.1)
Expand Down
10 changes: 5 additions & 5 deletions config/initializers/wings.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
Valkyrie.config.metadata_adapter = :freyja
Hyrax.config.query_index_from_valkyrie = true
Hyrax.config.index_adapter = :solr_index
Valkyrie::StorageAdapter.register(
Valkyrie::Storage::Disk.new(base_path: Rails.root.join("storage", "files"),
file_mover: FileUtils.method(:cp)),
:disk
)

if ActiveModel::Type::Boolean.new.cast(ENV.fetch("REPOSITORY_S3_STORAGE", false))
shrine_s3_options = {
Expand All @@ -53,11 +58,6 @@

Valkyrie.config.storage_adapter = :repository_s3
else
Valkyrie::StorageAdapter.register(
Valkyrie::Storage::Disk.new(base_path: Rails.root.join("storage", "files"),
file_mover: FileUtils.method(:cp)),
:disk
)
Valkyrie.config.storage_adapter = :disk
end
Valkyrie.config.indexing_adapter = :solr_index
Expand Down
Loading