Varnish container config fixes

Removed debug output from entrypoint

Author: namedgraph

docker-compose.yml

@@ -113,10 +113,7 @@ services:
     depends_on:
       - linkeddatahub
     tmpfs: /var/lib/varnish/varnishd:exec
-    environment:
-      - VARNISH_HTTP_PORT=6060
-      - VARNISH_SIZE=1G
-    command: [ "-t", "86400" ] # time to live
+    command: [ "-a", "http=:6060,HTTP", "-a", "proxy=:8443,PROXY", "-p", "feature=+http2", "-s", "file,/var/lib/varnish/storage.bin,3G", "-t", "86400" ] # HTTP and PROXY listeners, http2 support, 3GB disk storage, 86400s TTL
   varnish-admin:
     image: varnish:7.3.0
     user: root # otherwise the varnish user does not have permissions to the mounted folder which is owner by root
@@ -126,9 +123,7 @@ services:
     depends_on:
       - linkeddatahub
     tmpfs: /var/lib/varnish/varnishd:exec
-    environment:
-      - VARNISH_SIZE=1G
-    command: [ "-t", "86400", "-p", "timeout_idle=60s" ] # time to live
+    command: [ "-p", "feature=+http2", "-s", "malloc,1G", "-t", "86400", "-p", "timeout_idle=60s" ] # 1GB malloc storage, 86400s TTL, 60s idle timeout
   varnish-end-user:
     image: varnish:7.3.0
     user: root # otherwise varnish user does not have permissions to the mounted folder which is owner by root
@@ -138,9 +133,7 @@ services:
     depends_on:
       - linkeddatahub
     tmpfs: /var/lib/varnish/varnishd:exec
-    environment:
-      - VARNISH_SIZE=1G
-    command: [ "-t", "86400", "-p", "timeout_idle=60s" ] # time to live
+    command: [ "-p", "feature=+http2", "-s", "malloc,1G", "-t", "86400", "-p", "timeout_idle=60s" ] # 1GB malloc storage, 86400s TTL, 60s idle timeout
   email-server:
     image: namshi/smtp
     environment:

platform/entrypoint.sh

@@ -493,11 +493,6 @@ OWNER_KEY_URI=$(echo "$owner_metadata" | xmlstarlet sel -N srx="http://www.w3.or
 OWNER_KEY_DOC_URI=$(echo "$OWNER_KEY_URI" | sed 's|#this$||')
 OWNER_KEY_URI="${OWNER_KEY_DOC_URI}#this"
 
-printf "\n### Extracted OWNER_URI: %s\n" "$OWNER_URI"
-printf "\n### Extracted OWNER_DOC_URI: %s\n" "$OWNER_DOC_URI"
-printf "\n### Extracted OWNER_KEY_URI: %s\n" "$OWNER_KEY_URI"
-printf "\n### Extracted OWNER_KEY_DOC_URI: %s\n" "$OWNER_KEY_DOC_URI"
-
 printf "\n### Reading secretary metadata from existing file: %s\n" /var/linkeddatahub/based-datasets/root-secretary.nq
 
 trig --base="$ADMIN_BASE_URI" --output=nq "$SECRETARY_DATASET_PATH" > /var/linkeddatahub/based-datasets/root-secretary.nq
@@ -510,11 +505,6 @@ SECRETARY_KEY_URI=$(echo "$secretary_metadata" | xmlstarlet sel -N srx="http://w
 SECRETARY_KEY_DOC_URI=$(echo "$SECRETARY_KEY_URI" | sed 's|#this$||')
 SECRETARY_KEY_URI="${SECRETARY_KEY_DOC_URI}#this"
 
-printf "\n### Extracted SECRETARY_URI: %s\n" "$SECRETARY_URI"
-printf "\n### Extracted SECRETARY_DOC_URI: %s\n" "$SECRETARY_DOC_URI"
-printf "\n### Extracted SECRETARY_KEY_URI: %s\n" "$SECRETARY_KEY_URI"
-printf "\n### Extracted SECRETARY_KEY_DOC_URI: %s\n" "$SECRETARY_KEY_DOC_URI"
-
 # Note: LOAD_DATASETS check is now done per-app inside the loop
 
 # base the $CONTEXT_DATASET