Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
memoriav
Memobase 2020
services
Cantaloupe on Docker
Commits
b0be4920
Unverified
Commit
b0be4920
authored
Apr 05, 2021
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
cantaloupe.properties
View file @
b0be4920
...
...
@@ -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
=
tru
e
print_stack_trace_on_error_pages
=
fals
e
###########################################################################
# DELEGATE SCRIPT
...
...
@@ -147,7 +147,7 @@ FilesystemSource.BasicLookupStrategy.path_suffix =
#----------------------------------------
# Trusts insecure certificates and cipher suites.
HttpSource.allow_insecure
=
fals
e
HttpSource.allow_insecure
=
tru
e
# Request timeout in seconds.
HttpSource.request_timeout
=
...
...
delegates.rb
View file @
b0be4920
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment