Unverified Commit 956bcb87 authored by William Tucker's avatar William Tucker Committed by GitHub
Browse files

Merge pull request #267 from ESGF/s3

S3
parents 57997690 29894e28
Loading
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ server {
    location /thredds/fileServer/{{ .path }}/ {
        {{- if .s3Location }}
        {{- $s3 := .s3Location }}
        proxy_pass https://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}/{{ trimAll "/" $s3.dataPath }}/;
        proxy_pass {{ $s3.protocol }}://{{ $s3.host }}:{{ $s3.port }}/{{ $s3.bucket }}/{{ trimAll "/" $s3.dataPath }}/;
        {{- range .s3Location.extraNginxConf }}
        {{ .conf }}
        {{- end }}
        {{- else }}
        alias {{ trimSuffix "/" .location }}/;
        autoindex on;
+12 −1
Original line number Diff line number Diff line
@@ -215,7 +215,18 @@ data:
    # - name: CMIP5
    #   path: esg_dataroot
    #   location: /datacentre/archiveroots/archive/badc/cmip5/data

    # - name: "CMIP6Plus"
    #   path: "esg_cmip6"
    #   s3Location:
    #     host: hostname
    #     protocol: http or https
    #     port: port number
    #     bucket: bucket name
    #     dataPath: CMIP6Plus
    #     extraNginxConf (optional): a list of additional Nginx configurations
    #       - conf: proxy_set_header Host hostname;
    #       - conf: proxy_set_header X-Debug-Host hostname;
    #       - conf: proxy_set_header X-Forwarded-Host hostname;
  # The pod and container security contexts for data serving pods
  # In particular, these may be required if using hostPath volumes for data, depending
  # on the permissions of that data