From 51f66b37e5765098c3bf88e68152b796d49b30f4 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:42:21 -0400
Subject: [PATCH] simplify defaults

---
 .../components/thredds/catalog.xml.template     |  7 ++++++-
 birdhouse/components/thredds/default.env        | 17 ++++++-----------
 birdhouse/env.local.example                     |  3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/birdhouse/components/thredds/catalog.xml.template b/birdhouse/components/thredds/catalog.xml.template
index 17e3b2578..f7979d9b3 100644
--- a/birdhouse/components/thredds/catalog.xml.template
+++ b/birdhouse/components/thredds/catalog.xml.template
@@ -21,7 +21,12 @@
       </metadata>
 
       <filter>
-        ${THREDDS_DEFAULT_FILE_FILTERS}
+        <include wildcard="*.nc" />
+        <include wildcard="*.ncml" />
+        <include wildcard="*.txt" />
+        <include wildcard="*.md" />
+        <include wildcard="*.rst" />
+        <include wildcard="*.csv" />
         ${THREDDS_SERVICE_DATA_EXTRA_FILE_FILTERS}
       </filter>
 
diff --git a/birdhouse/components/thredds/default.env b/birdhouse/components/thredds/default.env
index 64778b3fd..fb741ded5 100644
--- a/birdhouse/components/thredds/default.env
+++ b/birdhouse/components/thredds/default.env
@@ -20,15 +20,6 @@ export THREDDS_SERVICE_DATA_URL_PATH='birdhouse'
 export THREDDS_MAGPIE_EXTRA_METADATA_PREFIXES='".+\\.txt", ".+\\.md", ".+\\.rst"'
 export THREDDS_MAGPIE_EXTRA_DATA_PREFIXES=''
 
-export THREDDS_DEFAULT_FILE_FILTERS='
-    <include wildcard="*.nc" />
-    <include wildcard="*.ncml" />
-    <include wildcard="*.txt" />
-    <include wildcard="*.md" />
-    <include wildcard="*.rst" />
-    <include wildcard="*.csv" />
-'
-
 export THREDDS_SERVICE_DATA_EXTRA_FILE_FILTERS=''
 
 export THREDDS_DATASET_DATASETSCAN_BODY="
@@ -37,7 +28,12 @@ export THREDDS_DATASET_DATASETSCAN_BODY="
       </metadata>
 
       <filter>
-        ${THREDDS_DEFAULT_FILE_FILTERS}
+        <include wildcard="*.nc" />
+        <include wildcard="*.ncml" />
+        <include wildcard="*.txt" />
+        <include wildcard="*.md" />
+        <include wildcard="*.rst" />
+        <include wildcard="*.csv" />
       </filter>
 "
 
@@ -51,7 +47,6 @@ VARS="
   \$THREDDS_DATASET_URL_PATH
   \$THREDDS_DATASET_LOCATION_ON_CONTAINER
   \$THREDDS_DATASET_DATASETSCAN_BODY
-  \$THREDDS_DEFAULT_FILE_FILTERS
 "
 
 OPTIONAL_VARS="
diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example
index 4679acc8f..8ca61f137 100644
--- a/birdhouse/env.local.example
+++ b/birdhouse/env.local.example
@@ -499,7 +499,7 @@ export THREDDS_ADDITIONAL_CATALOG=''
 # THREDDS_ADDITIONAL_CATALOG variable).
 # By default, the main dataset will only serve files with the following extensions: .nc .ncml .txt .md .rst .csv and will use
 # the THREDDS service named "all" (see components/thredds/catalog.xml.template). However this can be customized if desired.
-# See the example below which would change the configuration to also serve .h5 and .json files and exclude .md files. 
+# See the example below which would change the configuration to serve .h5, .md, and .json files. 
 # See the THREDDS documentation for the <datasetScan> element for all configuration options.
 #export THREDDS_DATASET_DATASETSCAN_BODY="
 #      <metadata inherited='true'>
@@ -507,7 +507,6 @@ export THREDDS_ADDITIONAL_CATALOG=''
 #      </metadata>
 #
 #      <filter>
-#        ${THREDDS_DEFAULT_FILE_FILTERS}
 #        <include wildcard='*.h5' />
 #        <include wildcard='*.json' />
 #        <exclude wildcard='*.md' />