Commit 5d98577c authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Adding SSL_CERT_FILE env variable.

parent ad8ac300

docker-compose-data-node.yml

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ services: 
     - esgf-config

   environment:

     - SSL_CERT_DIR=/etc/grid-security/certificates

     - SSL_CERT_FILE=/etc/certs/esgf-ca-bundle.crt

     - ESGF_HOSTNAME

   depends_on:

     - esgf-postgres

docker-compose.yml

+6 −3
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ services: 
    volumes:

     - $ESGF_CONFIG/httpd/certs/:/etc/certs/

     - $ESGF_CONFIG/httpd/conf/esgf-httpd.conf:/etc/httpd/conf.d/esgf-httpd.conf

     - $ESGF_CONFIG/grid-security/certificates/:/etc/grid-security/certificates/

     - $ESGF_CONFIG/esg/config/:/esg/config/

     - $ESGF_CONFIG/esg/config/tomcat/esg-truststore.ts:/usr/java/latest/jre/lib/security/jssecacerts

     #- $ESGF_CONFIG/grid-security/certificates/:/etc/grid-security/certificates/

     #- $ESGF_CONFIG/esg/config/:/esg/config/

     #- $ESGF_CONFIG/esg/config/tomcat/esg-truststore.ts:/usr/java/latest/jre/lib/security/jssecacerts

     - $ESGF_CONFIG/archives/grid_security_certs.tar.xz:/root/archives/grid_security_certs.tar.xz

     - $ESGF_CONFIG/archives/esgf_config.tar.xz:/root/archives/esgf_config.tar.xz



  # ESGF postgres database

  esgf-postgres:
@@ -177,6 +178,7 @@ services: 
   # - esgf-data-node

   environment:

     - SSL_CERT_DIR=/etc/grid-security/certificates

     - SSL_CERT_FILE=/etc/certs/esgf-ca-bundle.crt

     - COG_CONFIG_DIR=/usr/local/cog/cog_config

     - ESGF_HOSTNAME

   ports:
@@ -202,6 +204,7 @@ services: 
     - esgf-config

   environment:

     - SSL_CERT_DIR=/etc/grid-security/certificates

     - SSL_CERT_FILE=/etc/certs/esgf-ca-bundle.crt

     - ESGF_HOSTNAME

   depends_on:

     - esgf-postgres

docker-stack.yml

+1 −9
Original line number Diff line number Diff line
@@ -76,11 +76,6 @@ secrets: 
          ##################### ESGF SECRETS ##################

  esgf_config_files:

    file: $ESGF_CONFIG/archives/esgf_config.tar.xz

          ##################### ESGF-AUTH SECRETS ##################

  esgf_auth_config:

    file: $ESGF_CONFIG/esg/config/esgf_auth_config.json

  esgf_oauth2_secrets:

    file: $ESGF_CONFIG/esg/config/esgf_oauth2.json





services:
@@ -273,10 +268,6 @@ services: 
      - source: esgf_config_files

        target: /root/archives/esgf_config.tar.xz

        mode:   0600

      - source: esgf_auth_config

        target: /esg/config/esgf_auth_config.json

      - source: esgf_oauth2_secrets

        target: /esg/config/esgf_oauth2.json

    volumes:

      - cog_install_dir:/usr/local/cog/cog_install

      - cog_venv:/usr/local/cog/venv
@@ -285,6 +276,7 @@ services: 
      # - esgf-node-manager

    environment:

      - SSL_CERT_DIR=/etc/grid-security/certificates

      - SSL_CERT_FILE=/etc/certs/esgf-ca-bundle.crt

      - COG_CONFIG_DIR=/usr/local/cog/cog_config

      - ESGF_HOSTNAME

    ports: