Commit 9b5f8e44 authored by William Tucker's avatar William Tucker
Browse files

Fixed Jinja2 syntax

parent d8f7fa93

deploy/ansible/roles/data/templates/catalog.xml.j2

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 


    <!-- Produce a scan element for each of the given datasets -->

    {% for dataset in data_datasets %}

    {% if dataset.s3Location %}

    <datasetScan name="{{ dataset.s3Location.name }}" ID="{{ dataset.s3Location.path }}" path="{{ dataset.s3Location.path }}" location="cdms3://{{ dataset.s3Location.host }}:{{ dataset.s3Location.port }}/{{ dataset.s3Location.bucket }}?{{ dataset.s3Location.dataPath.strip("/") }}/#delimiter=/">

    {% if dataset.s3Location is defined %}

    <datasetScan name="{{ dataset.name }}" ID="{{ dataset.path }}" path="{{ dataset.path }}" location="cdms3://{{ dataset.s3Location.host }}:{{ dataset.s3Location.port }}/{{ dataset.s3Location.bucket }}?{{ dataset.s3Location.dataPath.strip("/") }}/#delimiter=/">

    {% else %}

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

    {% endif %}

deploy/ansible/roles/data/templates/fileserver.conf.j2

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ server { 
    # Create a location block for each dataset

    {% for dataset in data_datasets %}

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

        {% if dataset.s3Location %}

        {% if dataset.s3Location is defined %}

        proxy_pass https://{{ dataset.s3Location.host }}:{{ dataset.s3Location.port }}/{{ dataset.s3Location.bucket }}/{{ dataset.s3Location.dataPath.strip("/") }}/;

        {% else %}

        alias {{ dataset.location }}/;