Commit 003ad20e authored by William Tucker's avatar William Tucker
Browse files

Fixed template formatting issues

parent 77d34749

deploy/kubernetes/chart/files/fileServer/datasets.conf

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ server { 
    {{- range .Values.data.datasets }}

    location /thredds/fileServer/{{ .path }}/ {

        {{- if .s3Location }}

        {{- $s3 := .s3Location -}}

        proxy_pass https://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}/{{ $s3.dataPath }}/;

        {{- $s3 := .s3Location }}

        proxy_pass https://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}/{{ trimAll "/" $s3.dataPath }}/;

        {{- else }}

        alias {{ trimSuffix "/" .location }}/;

        try_files $uri =404;

deploy/kubernetes/chart/files/thredds/catalog.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
    <!-- Produce a scan element for each of the given datasets -->

    {{- range .Values.data.datasets }}

    {{- if .s3Location }}

    {{- $s3 := .s3Location -}}

    <datasetScan name="{{ .name }}" ID="{{ .path }}" path="{{ .path }}" location="cdms3://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}?{{ $s3.dataPath }}/#delimiter=/">

    {{- $s3 := .s3Location }}

    <datasetScan name="{{ .name }}" ID="{{ .path }}" path="{{ .path }}" location="cdms3://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}?{{ trimAll '/' $s3.dataPath }}/#delimiter=/">

    {{- else }}

    <datasetScan name="{{ .name }}" ID="{{ .path }}" path="{{ .path }}" location="{{ .location }}">

    {{- end }}