Commit 0a421f9c authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'master' of https://github.com/ESGF/esgf-docker into ansible-ssl-redirect

parents 5c0fc171 ae86f6bc

deploy/ansible/roles/data/defaults/main.yml

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ logstash_image_pull: "{{ image_pull }}" 
logstash_image_repository: logstash

# Settings for the stats server

logstash_stats_server: proxy02.cmcc.it

logstash_stats_port: 5044

logstash_stats_port: 5045

logstash_stats_certificate: |

  -----BEGIN CERTIFICATE-----

  MIIDyjCCArICCQDSgl2omUxgLTANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMC

deploy/kubernetes/chart/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ data: 
      # The default server is the CMCC server

      # Your IP must be whitelisted in order to send data to the CMCC service

      server: proxy02.cmcc.it

      port: 5044

      port: 5045

      certificate: |

        -----BEGIN CERTIFICATE-----

        MIIDyjCCArICCQDSgl2omUxgLTANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMC

images/thredds/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

ARG THREDDS_SHA1=0c689a762cb194de6ab4a8055761a5cb1ea9e01b

ARG THREDDS_SHA1=b103d337c7f3d909c3353cbd25227dff53dee9f8

ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war

RUN mkdir /application && \

    cd /application && \