Commit 24d70838 authored by Matt Pryor's avatar Matt Pryor
Browse files

Consolidate cache dirs in content/thredds/cache

parent cdd8b932

images/thredds/Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ RUN catalina.sh start && \ 
    catalina.sh stop && \

    # Remove any transient files that were created

    rm -f ./logs/catalina.{log,out} && \

    rm -rf ./temp/* ./work/* && \

    rm -rf ./content/thredds/cache/* && \

    # Transfer ownership of the entire content directory to the esgf user/group

    chown -R $ESGF_USER:$ESGF_GROUP ./content/thredds && \

images/thredds/threddsConfig.xml

+2 −4
Original line number Diff line number Diff line
@@ -163,11 +163,9 @@ 


  <NetcdfSubsetService>

    <allow>true</allow>

    <dir>/tmp/thredds/ncSubsetCache/</dir>

    <dir>/opt/tomcat/content/thredds/cache/ncSubsetCache/</dir>

    <scour>10 min</scour>

    <maxAge>-1 min</maxAge>

    <metarDataDir>/opt/tomcat/content/thredds/public/stn/</metarDataDir>

    <metarRawDir>/data/ldm/pub/decoded/netcdf/surface/metar/</metarRawDir>

  </NetcdfSubsetService>



  <Opendap>
@@ -183,7 +181,7 @@ 
  <WCS>

    <allow>true</allow>

    <allowRemote>false</allowRemote>

    <dir>/tmp/thredds/wcsCache/</dir>

    <dir>/opt/tomcat/content/thredds/cache/wcsCache/</dir>

    <scour>15 min</scour>

    <maxAge>30 min</maxAge>

  </WCS>