ExtraFiles tweaks (#309)

* Remove path * Make tpl optional * Run welcome through `tpl`
galaxyproject · Jul 8, 2021 · 85d6931 · 85d6931
1 parent a602da5
commit 85d6931
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/galaxy/templates/configmap-extra-files.yaml b/galaxy/templates/configmap-extra-files.yaml
@@ -15,10 +15,10 @@ kind: ConfigMap
 data:
 {{- end }}
   {{- include "galaxy.getFilenameFromPath" $key | nindent 2 }}: |
-  {{- if $entry.path }}
-    {{- ($.Files.Get $entry.path) | nindent 4 }}
-  {{- else }}
+  {{- if $entry.tpl }}
     {{- tpl (tpl $entry.content $) $ | nindent 4 }}
+  {{- else }}
+    {{- $entry.content | nindent 4 }}
   {{- end }}
 ---
 {{- end }}
@@ -33,4 +33,4 @@ data:
   probedb.py: |
     {{- (.Files.Get "scripts/probedb.py") | nindent 4 }}
 
----
+---
diff --git a/galaxy/values.yaml b/galaxy/values.yaml
@@ -583,6 +583,7 @@ extraFileMappings:
     applyToJob: false
     applyToWeb: true
     applyToWorkflow: false
+    tpl: true
     content: |
       <!DOCTYPE html>
       <html lang="en">