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

cantaloupe.properties

@@ -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 =

delegates.rb

@@ -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