From b4fecfdbd2e0f223dc8f167071089e4bf1237789 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Thu, 15 Feb 2018 09:11:43 -0700
Subject: [PATCH] cleaner ldmd formatting

---
 .../Installer.ldm/patch/etc/ldmd.conf         | 53 ++++++-------------
 .../Installer.ldm/patch/etc/pqact.conf        |  2 +-
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
index 0799932abf..c0050dac1c 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@@ -86,46 +86,27 @@ EXEC	"rtstats -h rtstats.unidata.ucar.edu"
 # messages).  The primary host will probably change over time -- depending on
 # which host can deliver the data-products most quickly on average.
 #
-# EVERYTHING 
-#
-#REQUEST CONDUIT|NGRID|FNMOC|CMC|WMO|NEXRAD3|FNEXRAD|UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu
-# 
 # DEFAULT
-#
-# USPLN
-#REQUEST	LIGHTNING	".*"	idd.unidata.ucar.edu
-# NLDN (Restricted Access)
-#REQUEST	LIGHTNING	".*"	striker.atmos.albany.edu
+#REQUEST	LIGHTNING	".*"	idd.unidata.ucar.edu # USPLN
+#REQUEST	LIGHTNING	".*"	striker.atmos.albany.edu # NLDN
 REQUEST NEXRAD3 "./p(DHR|DPR|DSP|DTA|DAA|HHC|N.Q|N.S|N.U|OHA)." idd.unidata.ucar.edu
 REQUEST FNEXRAD|IDS|DDPLUS ".*" idd.unidata.ucar.edu
-#REQUEST UNIWISC ".*" idd.unidata.ucar.edu
-REQUEST NGRID "^/(?!KWNR)([a-z0-9]+)$" idd.unidata.ucar.edu
-REQUEST NOTHER "^TIP... KNES.*" idd.unidata.ucar.edu
-REQUEST HDS|NIMAGE ".*" idd.unidata.ucar.edu
-REQUEST CONDUIT "nam"   idd.unidata.ucar.edu
-# Global GFS
-REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu
-# NDFD
-REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu
-# GOES-East GLM
-REQUEST DIFAX "GLM" idd.unidata.ucar.edu
-# GOES-East
-REQUEST EXP ".*" lead.unidata.ucar.edu
-#REQUEST NOTHER "^TI[RS]... KNES.*" idd.unidata.ucar.edu
-# CMC
-REQUEST CMC ".*" idd.unidata.ucar.edu
-# CONDUIT RAP40
-#REQUEST CONDUIT "rap"   idd.unidata.ucar.edu
-# FNMOC
+REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu	# AREA/GINI
+REQUEST EXP "WwWind" idd.unidata.ucar.edu		# ESPL/PSD Profilers
+REQUEST NOTHER "^TIP... KNES" idd.unidata.ucar.edu	# GOES-16 sectors
+REQUEST DIFAX "GLM" idd.unidata.ucar.edu		# GOES-16 GLM
+REQUEST EXP ".*" lead.unidata.ucar.edu			# GOES-16 ABI
+#REQUEST NOTHER "^TI[RS]... KNES" idd.unidata.ucar.edu	# GOES-16 ABI (duplicate)
+REQUEST NGRID ".*" idd.unidata.ucar.edu
+REQUEST HDS ".*" idd.unidata.ucar.edu
+#REQUEST CMC ".*" idd.unidata.ucar.edu
 #REQUEST FNMOC ".*" idd.unidata.ucar.edu
-# FSL/GSD HRRR sub-hourly
-#REQUEST FSL2 "^GRIB2.FSL.HRRR" hrrr.unidata.ucar.edu
-# NSSL MRMS (Restricted Access)
-#REQUEST EXP ".*" 140.90.98.15
-# ESRL Hourly Profiler Obs
-#REQUEST EXP ".*" 140.172.38.113
-# NGRID MRMS
-#REQUEST NGRID "^YAU[CDLMPQS].. KWNR" idd.unidata.ucar.edu
+REQUEST CONDUIT "nam" idd.unidata.ucar.edu 		# NAM12
+REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu 		# GFS0p25
+#REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu 		# NDFD
+#REQUEST CONDUIT "awp252" idd.unidata.ucar.edu 		# RAP20
+#REQUEST FSL2 "HRRR" hrrr.unidata.ucar.edu		# HRRRX sub-hourly
+#REQUEST NGRID "^YAU[CDLMPQS]" idd.unidata.ucar.edu	# MRMS
 #
 ###############################################################################
 # Allow Entries
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
index 727f323177..9771d2e2d0 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@@ -112,7 +112,7 @@ IDS|DDPLUS	^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..)
 # ESRL Hourly Profiler Obs
 #
 EXP	^/PSD/BUFR/WwWind/(IUPT02.+bufr)\.[0-9]{10}
-	FILE	-overwrite -close -edex -log
+	FILE	-overwrite -close -edex
 	/awips2/data_store/profiler/\1
 #
 # Redbook graphics