In order to mitigate against the brute force attacks against Gitlab accounts, we are moving to all edu-ID Logins. We would like to remind you to link your account with your edu-id. Login will be possible only by edu-ID after November 30, 2021. Here you can find the instructions for linking your account.

If you don't have a SWITCH edu-ID, you can create one with this guide here

kind regards

Unverified Commit b0be4920 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

Merge branch '4.x' of gitlab.switch.ch:memoriav/memobase-2020/services/cantaloupe-docker into 4.x

parents 7e0b80d0 975fb3fa
Pipeline #24149 passed with stage
in 4 minutes and 55 seconds
......@@ -56,7 +56,7 @@ max_pixels = 100000000
# Maximum scale to allow (1.0 = full scale; 0 = no maximum).
max_scale = 1.0
print_stack_trace_on_error_pages = true
print_stack_trace_on_error_pages = false
###########################################################################
# DELEGATE SCRIPT
......@@ -147,7 +147,7 @@ FilesystemSource.BasicLookupStrategy.path_suffix =
#----------------------------------------
# Trusts insecure certificates and cipher suites.
HttpSource.allow_insecure = false
HttpSource.allow_insecure = true
# Request timeout in seconds.
HttpSource.request_timeout =
......
......@@ -51,14 +51,18 @@ class CustomDelegate
def source(options = {})
uri = context['identifier']
if uri.start_with?("file:")
return 'FilesystemSource'
else
if uri.start_with?("http")
return 'HttpSource'
else
return 'FilesystemSource'
end
end
def filesystemsource_pathname(options = {})
return "/home/cantaloupe/images/#{context['identifier'].split("$").last}"
filename = context['identifier']
if filename.start_with?("file:")
filename = filename.split("$").last
end
return "/home/cantaloupe/images/#{filename}"
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment