diff --git a/README.md b/README.md
index 9463622..fa639a7 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,11 @@ Configuration files
- kept in git repo TdsConfig
- each machine has their own subdirectory:
- - idd : common to all (4.6) idd servers
+ - idd : common to all idd servers
- rdavm : at CISL/RDA
- - remotetest : where? opendap/netcdf C test server
- startup: this should be the minimal configuration for running a thredds server
- thredds : atm-nwsc (/opt/tds) (idd + casestudies)
- - threddsTest : atm-nwsc (/opt/tds-test) (idd + casestudies + preprocessed)
+ - threddsTest : atm-nwsc (/opt/tds-test) (idd + casestudies + preprocessed + remotetest)
- threddsDev : lead (/opt/tds-dev)
- awsL2 : jetstream machine serving AWS Level2 radar archive data
@@ -30,7 +29,7 @@ Configuration files
The build and upload of config.zip files is automatically performed by GitHub Actions for
all changes committed to the repository.
-- config.zip hosted on [Unidata Nexus](https://artifacts.unidata.ucar.edu/#browse/browse:downloads-tds-config)
+- config.zip hosted on the [Unidata artifacts server](https://artifacts.unidata.ucar.edu/#browse/browse:downloads-tds-config)
- to make changes to config files:
- Edit files, e.g. `thredds/*`
diff --git a/idd/idd/satellite.xml b/idd/idd/satellite.xml
index fe0fc3b..384d30e 100644
--- a/idd/idd/satellite.xml
+++ b/idd/idd/satellite.xml
@@ -188,6 +188,8 @@
+
+
+ End of NESDIS Blended data -->
diff --git a/remotetest/README.md b/remotetest/README.md
index c194b20..7402f07 100644
--- a/remotetest/README.md
+++ b/remotetest/README.md
@@ -1,96 +1,12 @@
-Setup Instructions For The remotetest.unidata.ucar.edu Tomcat Server
+remotetest.unidata.ucar.edu host now combined with thredds-test server
====
+** This method of updating the remotetest server is defunct and should not be used! **
-When installing a new thredds server on
-_remotetest.unidata.ucar.edu_, the process
-is as follows. This overrides any other instructions.
+The remotetest.unidata.ucar.edu is no longer a standalone host.
-For purposes of this process, it is assumed that the content and logs
-directories are in _/opt/remotetest_
-on the machine _remotetest.unidata.ucar.edu_.
+The `dts.war` and `d4ts.war` files are hosted on the same tomcat instance as the thredds-test server.
-1. Enter the directory _TdsConfig/remotetest_.
-2. Edit as needed the following files:
- * _thredds/threddsConfig.xml_
- * _thredds/catalog.xml_
-3. Run the shell script 'content.sh' to construct the file
- 'content.tar'
-4. Copy _content.tar_ to the _remotetest.unidata.ucar.edu_ machine.
-5. Stop the tomcat server.
-6. Move to the directory _/opt/remotetest/content_.
-7. Untar content.tar into _/opt/remotetest/content_.
-8. (optional) clear logs: _rm -f /opt/remotetest/logs/*_
-9. Build and install server side keystore and truststore (see below)
-10. (optional) modify *$CATALINA_HOME/conf/server.xml* (see below)
-11. (optional) modify *$CATALINA_HOME/conf/tomcat-users.xml* (see below)
-12. Restart the tomcat server.
+* The `defunct` directory contains the old files and documentation for updating this host.
+* The `thredds` directory contains the data used by this host.
-Optional Changes to $CATALINA_HOME/conf/server.xml
-----
-On a one time basis, you will need to modify *$CATALINA_HOME/conf/server.xml*
-to support SSL and also to support a password protected dataset.
-
-1. Insert the following <Connector> into conf/server.xml
-
- <Connector
- port="8443"
- maxThreads="150"
- SSLEnabled="true"
- scheme="https"
- secure="true"
- clientAuth="want"
- sslProtocol="TLS"
- keyAlias="1"
- keystoreFile="conf/ServerKeystore.jks"
- keystorePass="password"
- keyPass="password"
- />
-
-Note the 'clientAuth="want"' line. This tells tomcat to attempt
-to use client-side keys but if not successful, ignore and continue.
-See below with respect to the 'keystoreFile' line.
-
-Optional Changes to $CATALINA_HOME/conf/tomcat-users.xml
-----
-Since access to a restricted dataset is used as a test,
-the tomcat-users.xml file must be modified to include the following lines.
-
-
-
-
-
-The roles defined here must be consistent with _content/thredds/catalog.xml_.
-
-Depending on your tomcat installation, the tiggeUser password may
-need to be encrypted. You will also need to ensure that 'https:'
-access is enabled either in tomcat (see above) or apache httpd.
-
-Key/Trust Store Construction and Installation:
-----
-If you are running a standalone Tomcat (typically using Intellij),
-and in order to support server keys and (optionally) client side keys
-the shell script certs.sh must executed. This will construct
-JKS format key and trust stores.
-
-1. Run certs.sh to produce
- * ServerKeystore.jks
- * ClientKeystore.jks
- * ClientTruststore.jks
-2. Put ServerKeystore.jks and ClientTruststore.jks into ${CATALINA_HOME}/conf
-
-Notes:
------
-1. Verify that all the datasets referenced in catalog.xml
- are in place in /opt/remotetest/content/thredds/public.
- Note that the "locations" in catalog.xml are not actual paths:
- effectively the "content/" part refers to
- /opt/remotetest/content/thredds/public
-
-2. If you plan to modify /opt/remotetest/content, make sure
- you keep a backup copy.
-
-3. Make sure that the following environment variable in setenv.sh is set:
- CONTENT_ROOT="-Dtds.content.root.path=/opt/remotetest/content"
-
+Please reference the `threddstest/catalog.xml` file for `threddstest/remotetest` directory for more information.
diff --git a/remotetest/build.info b/remotetest/build.info
deleted file mode 100644
index e69de29..0000000
diff --git a/remotetest/defunct/README.md b/remotetest/defunct/README.md
new file mode 100644
index 0000000..04fbbbf
--- /dev/null
+++ b/remotetest/defunct/README.md
@@ -0,0 +1,9 @@
+remotetest.unidata.ucar.edu host now combined with thredds-test server
+====
+** This method of updating the remotetest server is defunct and should not be used! **
+
+The remotetest.unidata.ucar.edu is no longer a standalone host.
+
+The `dts.war` and `d4ts.war` files are hosted on the same tomcat instance as the thredds-test server.
+
+Please reference the `threddstest/catalog.xml` file for `threddstest/remotetest` directory for more information.
diff --git a/remotetest/defunct/README.md.old b/remotetest/defunct/README.md.old
new file mode 100644
index 0000000..c194b20
--- /dev/null
+++ b/remotetest/defunct/README.md.old
@@ -0,0 +1,96 @@
+Setup Instructions For The remotetest.unidata.ucar.edu Tomcat Server
+====
+
+When installing a new thredds server on
+_remotetest.unidata.ucar.edu_, the process
+is as follows. This overrides any other instructions.
+
+For purposes of this process, it is assumed that the content and logs
+directories are in _/opt/remotetest_
+on the machine _remotetest.unidata.ucar.edu_.
+
+1. Enter the directory _TdsConfig/remotetest_.
+2. Edit as needed the following files:
+ * _thredds/threddsConfig.xml_
+ * _thredds/catalog.xml_
+3. Run the shell script 'content.sh' to construct the file
+ 'content.tar'
+4. Copy _content.tar_ to the _remotetest.unidata.ucar.edu_ machine.
+5. Stop the tomcat server.
+6. Move to the directory _/opt/remotetest/content_.
+7. Untar content.tar into _/opt/remotetest/content_.
+8. (optional) clear logs: _rm -f /opt/remotetest/logs/*_
+9. Build and install server side keystore and truststore (see below)
+10. (optional) modify *$CATALINA_HOME/conf/server.xml* (see below)
+11. (optional) modify *$CATALINA_HOME/conf/tomcat-users.xml* (see below)
+12. Restart the tomcat server.
+
+Optional Changes to $CATALINA_HOME/conf/server.xml
+----
+On a one time basis, you will need to modify *$CATALINA_HOME/conf/server.xml*
+to support SSL and also to support a password protected dataset.
+
+1. Insert the following <Connector> into conf/server.xml
+
+ <Connector
+ port="8443"
+ maxThreads="150"
+ SSLEnabled="true"
+ scheme="https"
+ secure="true"
+ clientAuth="want"
+ sslProtocol="TLS"
+ keyAlias="1"
+ keystoreFile="conf/ServerKeystore.jks"
+ keystorePass="password"
+ keyPass="password"
+ />
+
+Note the 'clientAuth="want"' line. This tells tomcat to attempt
+to use client-side keys but if not successful, ignore and continue.
+See below with respect to the 'keystoreFile' line.
+
+Optional Changes to $CATALINA_HOME/conf/tomcat-users.xml
+----
+Since access to a restricted dataset is used as a test,
+the tomcat-users.xml file must be modified to include the following lines.
+
+
+
+
+
+The roles defined here must be consistent with _content/thredds/catalog.xml_.
+
+Depending on your tomcat installation, the tiggeUser password may
+need to be encrypted. You will also need to ensure that 'https:'
+access is enabled either in tomcat (see above) or apache httpd.
+
+Key/Trust Store Construction and Installation:
+----
+If you are running a standalone Tomcat (typically using Intellij),
+and in order to support server keys and (optionally) client side keys
+the shell script certs.sh must executed. This will construct
+JKS format key and trust stores.
+
+1. Run certs.sh to produce
+ * ServerKeystore.jks
+ * ClientKeystore.jks
+ * ClientTruststore.jks
+2. Put ServerKeystore.jks and ClientTruststore.jks into ${CATALINA_HOME}/conf
+
+Notes:
+-----
+1. Verify that all the datasets referenced in catalog.xml
+ are in place in /opt/remotetest/content/thredds/public.
+ Note that the "locations" in catalog.xml are not actual paths:
+ effectively the "content/" part refers to
+ /opt/remotetest/content/thredds/public
+
+2. If you plan to modify /opt/remotetest/content, make sure
+ you keep a backup copy.
+
+3. Make sure that the following environment variable in setenv.sh is set:
+ CONTENT_ROOT="-Dtds.content.root.path=/opt/remotetest/content"
+
diff --git a/remotetest/altcerts.sh b/remotetest/defunct/altcerts.sh
similarity index 100%
rename from remotetest/altcerts.sh
rename to remotetest/defunct/altcerts.sh
diff --git a/remotetest/certs.sh b/remotetest/defunct/certs.sh
similarity index 100%
rename from remotetest/certs.sh
rename to remotetest/defunct/certs.sh
diff --git a/remotetest/content.sh b/remotetest/defunct/content.sh
similarity index 100%
rename from remotetest/content.sh
rename to remotetest/defunct/content.sh
diff --git a/remotetest/obsolete/ca.sh b/remotetest/defunct/obsolete/ca.sh
similarity index 100%
rename from remotetest/obsolete/ca.sh
rename to remotetest/defunct/obsolete/ca.sh
diff --git a/remotetest/obsolete/catalog.xml b/remotetest/defunct/obsolete/catalog.xml
similarity index 100%
rename from remotetest/obsolete/catalog.xml
rename to remotetest/defunct/obsolete/catalog.xml
diff --git a/remotetest/obsolete/enhancedCatalog.xml b/remotetest/defunct/obsolete/enhancedCatalog.xml
similarity index 100%
rename from remotetest/obsolete/enhancedCatalog.xml
rename to remotetest/defunct/obsolete/enhancedCatalog.xml
diff --git a/remotetest/obsolete/public/catalog.xml b/remotetest/defunct/obsolete/public/catalog.xml
similarity index 100%
rename from remotetest/obsolete/public/catalog.xml
rename to remotetest/defunct/obsolete/public/catalog.xml
diff --git a/remotetest/obsolete/public/enhancedCatalog.xml b/remotetest/defunct/obsolete/public/enhancedCatalog.xml
similarity index 100%
rename from remotetest/obsolete/public/enhancedCatalog.xml
rename to remotetest/defunct/obsolete/public/enhancedCatalog.xml
diff --git a/remotetest/obsolete/public/testdata/2004050300_eta_211.nc b/remotetest/defunct/obsolete/public/testdata/2004050300_eta_211.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/2004050300_eta_211.nc
rename to remotetest/defunct/obsolete/public/testdata/2004050300_eta_211.nc
diff --git a/remotetest/obsolete/public/testdata/2004050312_eta_211.nc b/remotetest/defunct/obsolete/public/testdata/2004050312_eta_211.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/2004050312_eta_211.nc
rename to remotetest/defunct/obsolete/public/testdata/2004050312_eta_211.nc
diff --git a/remotetest/obsolete/public/testdata/2004050400_eta_211.nc b/remotetest/defunct/obsolete/public/testdata/2004050400_eta_211.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/2004050400_eta_211.nc
rename to remotetest/defunct/obsolete/public/testdata/2004050400_eta_211.nc
diff --git a/remotetest/obsolete/public/testdata/2004050412_eta_211.nc b/remotetest/defunct/obsolete/public/testdata/2004050412_eta_211.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/2004050412_eta_211.nc
rename to remotetest/defunct/obsolete/public/testdata/2004050412_eta_211.nc
diff --git a/remotetest/obsolete/public/testdata/mydata1.nc b/remotetest/defunct/obsolete/public/testdata/mydata1.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/mydata1.nc
rename to remotetest/defunct/obsolete/public/testdata/mydata1.nc
diff --git a/remotetest/obsolete/public/testdata/testData.nc b/remotetest/defunct/obsolete/public/testdata/testData.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/testData.nc
rename to remotetest/defunct/obsolete/public/testdata/testData.nc
diff --git a/remotetest/obsolete/public/testdata/testData2.grib2 b/remotetest/defunct/obsolete/public/testdata/testData2.grib2
similarity index 100%
rename from remotetest/obsolete/public/testdata/testData2.grib2
rename to remotetest/defunct/obsolete/public/testdata/testData2.grib2
diff --git a/remotetest/obsolete/public/testdata/testData2.grib2.ncx b/remotetest/defunct/obsolete/public/testdata/testData2.grib2.ncx
similarity index 100%
rename from remotetest/obsolete/public/testdata/testData2.grib2.ncx
rename to remotetest/defunct/obsolete/public/testdata/testData2.grib2.ncx
diff --git a/remotetest/obsolete/public/testdata/zeroLengthFile.nc b/remotetest/defunct/obsolete/public/testdata/zeroLengthFile.nc
similarity index 100%
rename from remotetest/obsolete/public/testdata/zeroLengthFile.nc
rename to remotetest/defunct/obsolete/public/testdata/zeroLengthFile.nc
diff --git a/remotetest/obsolete/public/testdods/K1VHR.nc b/remotetest/defunct/obsolete/public/testdods/K1VHR.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/K1VHR.nc
rename to remotetest/defunct/obsolete/public/testdods/K1VHR.nc
diff --git a/remotetest/obsolete/public/testdods/K1VHR_05JUL2012_0700_L2B_OLR.h5 b/remotetest/defunct/obsolete/public/testdods/K1VHR_05JUL2012_0700_L2B_OLR.h5
similarity index 100%
rename from remotetest/obsolete/public/testdods/K1VHR_05JUL2012_0700_L2B_OLR.h5
rename to remotetest/defunct/obsolete/public/testdods/K1VHR_05JUL2012_0700_L2B_OLR.h5
diff --git a/remotetest/obsolete/public/testdods/coads_climatology.nc b/remotetest/defunct/obsolete/public/testdods/coads_climatology.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/coads_climatology.nc
rename to remotetest/defunct/obsolete/public/testdods/coads_climatology.nc
diff --git a/remotetest/obsolete/public/testdods/in.nc b/remotetest/defunct/obsolete/public/testdods/in.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/in.nc
rename to remotetest/defunct/obsolete/public/testdods/in.nc
diff --git a/remotetest/obsolete/public/testdods/in_4.nc b/remotetest/defunct/obsolete/public/testdods/in_4.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/in_4.nc
rename to remotetest/defunct/obsolete/public/testdods/in_4.nc
diff --git a/remotetest/obsolete/public/testdods/in_grp.nc b/remotetest/defunct/obsolete/public/testdods/in_grp.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/in_grp.nc
rename to remotetest/defunct/obsolete/public/testdods/in_grp.nc
diff --git a/remotetest/obsolete/public/testdods/nametest3.nc b/remotetest/defunct/obsolete/public/testdods/nametest3.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/nametest3.nc
rename to remotetest/defunct/obsolete/public/testdods/nametest3.nc
diff --git a/remotetest/obsolete/public/testdods/nametest4.nc b/remotetest/defunct/obsolete/public/testdods/nametest4.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/nametest4.nc
rename to remotetest/defunct/obsolete/public/testdods/nametest4.nc
diff --git a/remotetest/obsolete/public/testdods/rtofs.nc b/remotetest/defunct/obsolete/public/testdods/rtofs.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/rtofs.nc
rename to remotetest/defunct/obsolete/public/testdods/rtofs.nc
diff --git a/remotetest/obsolete/public/testdods/testData.nc b/remotetest/defunct/obsolete/public/testdods/testData.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/testData.nc
rename to remotetest/defunct/obsolete/public/testdods/testData.nc
diff --git a/remotetest/obsolete/public/testdods/testgrid1.cdl b/remotetest/defunct/obsolete/public/testdods/testgrid1.cdl
similarity index 100%
rename from remotetest/obsolete/public/testdods/testgrid1.cdl
rename to remotetest/defunct/obsolete/public/testdods/testgrid1.cdl
diff --git a/remotetest/obsolete/public/testdods/testgrid1.nc b/remotetest/defunct/obsolete/public/testdods/testgrid1.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/testgrid1.nc
rename to remotetest/defunct/obsolete/public/testdods/testgrid1.nc
diff --git a/remotetest/obsolete/public/testdods/testgrid2.cdl b/remotetest/defunct/obsolete/public/testdods/testgrid2.cdl
similarity index 100%
rename from remotetest/obsolete/public/testdods/testgrid2.cdl
rename to remotetest/defunct/obsolete/public/testdods/testgrid2.cdl
diff --git a/remotetest/obsolete/public/testdods/testgrid2.nc b/remotetest/defunct/obsolete/public/testdods/testgrid2.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/testgrid2.nc
rename to remotetest/defunct/obsolete/public/testdods/testgrid2.nc
diff --git a/remotetest/obsolete/public/testdods/testgrid_samedim.nc b/remotetest/defunct/obsolete/public/testdods/testgrid_samedim.nc
similarity index 100%
rename from remotetest/obsolete/public/testdods/testgrid_samedim.nc
rename to remotetest/defunct/obsolete/public/testdods/testgrid_samedim.nc
diff --git a/remotetest/obsolete/public/threddsConfig.xml b/remotetest/defunct/obsolete/public/threddsConfig.xml
similarity index 100%
rename from remotetest/obsolete/public/threddsConfig.xml
rename to remotetest/defunct/obsolete/public/threddsConfig.xml
diff --git a/remotetest/obsolete/public/wcsExample/catalog.xml b/remotetest/defunct/obsolete/public/wcsExample/catalog.xml
similarity index 100%
rename from remotetest/obsolete/public/wcsExample/catalog.xml
rename to remotetest/defunct/obsolete/public/wcsExample/catalog.xml
diff --git a/remotetest/obsolete/public/wcsExample/testdata/ocean.nc b/remotetest/defunct/obsolete/public/wcsExample/testdata/ocean.nc
similarity index 100%
rename from remotetest/obsolete/public/wcsExample/testdata/ocean.nc
rename to remotetest/defunct/obsolete/public/wcsExample/testdata/ocean.nc
diff --git a/remotetest/obsolete/public/wmsConfig.xml b/remotetest/defunct/obsolete/public/wmsConfig.xml
similarity index 100%
rename from remotetest/obsolete/public/wmsConfig.xml
rename to remotetest/defunct/obsolete/public/wmsConfig.xml
diff --git a/remotetest/obsolete/threddsConfig.xml b/remotetest/defunct/obsolete/threddsConfig.xml
similarity index 100%
rename from remotetest/obsolete/threddsConfig.xml
rename to remotetest/defunct/obsolete/threddsConfig.xml
diff --git a/remotetest/obsolete/wmsConfig.dtd b/remotetest/defunct/obsolete/wmsConfig.dtd
similarity index 100%
rename from remotetest/obsolete/wmsConfig.dtd
rename to remotetest/defunct/obsolete/wmsConfig.dtd
diff --git a/remotetest/obsolete/wmsConfig.xml b/remotetest/defunct/obsolete/wmsConfig.xml
similarity index 100%
rename from remotetest/obsolete/wmsConfig.xml
rename to remotetest/defunct/obsolete/wmsConfig.xml
diff --git a/remotetest/root/favicon.ico b/remotetest/defunct/root/favicon.ico
similarity index 100%
rename from remotetest/root/favicon.ico
rename to remotetest/defunct/root/favicon.ico
diff --git a/remotetest/root/robots.txt b/remotetest/defunct/root/robots.txt
similarity index 100%
rename from remotetest/root/robots.txt
rename to remotetest/defunct/root/robots.txt
diff --git a/threddsTest/catalog.xml b/threddsTest/catalog.xml
index 9c6a1a9..0016187 100644
--- a/threddsTest/catalog.xml
+++ b/threddsTest/catalog.xml
@@ -16,4 +16,8 @@
+
+
+
+
diff --git a/threddsTest/remotetest/catalog.xml b/threddsTest/remotetest/catalog.xml
new file mode 100644
index 0000000..0c86472
--- /dev/null
+++ b/threddsTest/remotetest/catalog.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+ Grid
+
+
+
+
+
+ all
+ Grid
+
+
+
+
+
+