Commit 440fe603 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Working on including esg publisher.

parent 401deb61

data-node/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ COPY thredds/conf/threddsConfig.xml /esg/content/thredds/threddsConfig.xml 


# ESGF root catalog

COPY thredds/conf/catalog.xml /esg/content/thredds/catalog.xml

COPY thredds/conf/esgcet/catalog.xml /esg/content/thredds/esgcet/catalog.xml



# TDS customized applicationContext.xml file with ESGF authorizer

COPY thredds/conf/applicationContext.xml /usr/local/tomcat/webapps/thredds/WEB-INF/applicationContext.xml
@@ -106,7 +107,7 @@ RUN chmod +x /usr/local/bin/change_data_node_password.sh 
# COPY esgf-content/thredds/ /esg/content/thredds/



# TDS catalogs location

RUN mkdir -p /esg/content/thredds/esgcet

#RUN mkdir -p /esg/content/thredds/esgcet



# change ownership of content directory

RUN chown -R tomcat:tomcat  /esg/content/thredds/

data-node/scripts/change_data_node_password.sh

+3 −2
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ echo "Setting digested password=$password_hash" 
# replace digested password in tomcat-users.xml

sed -i -- 's/password=\"[^\"]*\"/password=\"'"${password_hash}"'\"/g' /esg/config/tomcat/tomcat-users.xml



# replace clear-text password in esg.ini

# TO DO
 
# replace clear-text passwords in esg.ini

sed -i -- 's/dbsuper:changeit/dbsuper:'"${ESGF_PASSWORD}"'/g' /esg/config/esgcet/esg.ini

sed -i -- 's/thredds_password.*/thredds_password = '"${ESGF_PASSWORD}"'/g' /esg/config/esgcet/esg.ini

data-node/thredds/conf/esgcet/catalog.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8'?>

<catalog xmlns:xlink="http://www.w3.org/1999/xlink" 

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"     

         xmlns="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0" 

         name="Earth System Grid catalog" 

         xsi:schemaLocation="http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0 http://www.unidata.ucar.edu/schemas/thredds/InvCatalog.1.0.2.xsd">



</catalog>

docker-compose-data-node.yml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ services: 
    volumes:

      - tds_data:/esg/content/thredds

      - $ESGF_CONFIG/webapps/thredds/WEB-INF/web.xml:/usr/local/tomcat/webapps/thredds/WEB-INF/web.xml

      - $ESGF_DATA_DIR:/esg/data

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

      - $ESGF_CONFIG/globus/certificate-file:/root/.globus/certificate-file

    volumes_from:

      - esgf-config

    environment: