From 517c377daae35fd2c4a3ba2af9e4ca80596889a2 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Tue, 7 Dec 2021 19:27:34 -0500 Subject: [PATCH 1/4] Added change to set the LDM Server Port to 388 --- rpms/awips2.upc/Installer.awips/programs/edex | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpms/awips2.upc/Installer.awips/programs/edex b/rpms/awips2.upc/Installer.awips/programs/edex index a0155fc6c1..6f556e13a6 100755 --- a/rpms/awips2.upc/Installer.awips/programs/edex +++ b/rpms/awips2.upc/Installer.awips/programs/edex @@ -287,6 +287,12 @@ edex_setup() { if [ -d "/awips2/ldm/etc" ]; then su - awips -c 'regutil -s '$HOSTNAME' /hostname' fi + + # ldm port + if [ -d "/awips2/ldm/etc" ]; then + su - awips -c 'regutil -s '388' /server/port' + fi + edit_setup } From 94ea683667cf38f009b793e605615c9cb100b032 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Wed, 8 Dec 2021 10:52:59 -0500 Subject: [PATCH 2/4] Update for the logs directory to get created for the NDM cron --- rpms/awips2.edex/Installer.edex/component.spec | 16 +--------------- .../Installer.edex/programs/logs/updateNDM.log | 0 2 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 rpms/awips2.edex/Installer.edex/programs/logs/updateNDM.log diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec index 550b8caf07..aef5190482 100644 --- a/rpms/awips2.edex/Installer.edex/component.spec +++ b/rpms/awips2.edex/Installer.edex/component.spec @@ -62,24 +62,10 @@ if [ $? -ne 0 ]; then exit 1 fi -mkdir -p %{_build_root}/awips2/edex/data/ndm -if [ $? -ne 0 ]; then - exit 1 -fi - -mkdir -p %{_build_root}/awips2/dev -if [ $? -ne 0 ]; then - exit 1 -fi - -mkdir -p %{_build_root}/awips2/dev/logs -if [ $? -ne 0 ]; then - exit 1 -fi - /bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/qpidNotify.py ${RPM_BUILD_ROOT}/awips2/edex/bin/ /bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/updateNDM.pl ${RPM_BUILD_ROOT}/awips2/dev/ +/bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/logs ${RPM_BUILD_ROOT}/awips2/dev/ /bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/ndm/* ${RPM_BUILD_ROOT}/awips2/edex/data/ndm/ diff --git a/rpms/awips2.edex/Installer.edex/programs/logs/updateNDM.log b/rpms/awips2.edex/Installer.edex/programs/logs/updateNDM.log new file mode 100644 index 0000000000..e69de29bb2 From 9a5f1f4e4cfe85e9d39731441e4e224196425f68 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Thu, 9 Dec 2021 12:47:06 -0500 Subject: [PATCH 3/4] Minor path changes and repo name changes to the awips_install.sh script --- awips_install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awips_install.sh b/awips_install.sh index 8799f798d6..df1495c140 100755 --- a/awips_install.sh +++ b/awips_install.sh @@ -24,7 +24,7 @@ function stop_edex_services { function check_yumfile { if [[ $(grep "release 7" /etc/redhat-release) ]]; then - repofile=el7.repo + repofile=awips2.repo else echo "You need to be running CentOS7 or RedHat7" exit @@ -34,7 +34,7 @@ function check_yumfile { cp /etc/yum.repos.d/awips2.repo /etc/yum.repos.d/awips2.repo-${date} fi - wget_url="https://www.unidata.ucar.edu/software/awips2/doc/${repofile}" + wget_url="https://downloads.unidata.ucar.edu/awips2/current/linux/${repofile}" echo "wget -O /etc/yum.repos.d/awips2.repo ${wget_url}" wget -O /etc/yum.repos.d/awips2.repo ${wget_url} @@ -197,7 +197,7 @@ function remove_edex { exit else for dir in $(ls /awips2/); do - if [ $dir != cave ]; then + if [ $dir != dev ] && [ $dir != cave ] ; then echo "Removing /awips2/$dir" rm -rf /awips2/$dir fi From 752a38add5af242b3048d23190ae7d143987c551 Mon Sep 17 00:00:00 2001 From: Tiffany Meyer Date: Thu, 9 Dec 2021 12:47:21 -0500 Subject: [PATCH 4/4] Updated the modes.xml to resolve issue of lma plugin not starting on the ingestGoesR mode -Added the "lma" plugin to be excluded in the pluginExclude mode (which both the ingestGoesR and ingestRadar calls) -Added the "lma" plugin to be excluded in the pluginModelSoundingExclude mode (which ingestGrids calls) -Removed the "lma" plugin directly from the ingestRadar mode since it's referenced in the pluginExclude -On the Default EDEX machine, the lma plugin will start up --- edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml b/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml index 026010912a..f1734e6133 100644 --- a/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml +++ b/edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml @@ -62,7 +62,7 @@ ingest pluginExclude goesrExclude - .*(lma|airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).* + .*(airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).* .*(nonconvsigmet|satellite|sgwh|ssha|stats|stormtrack|textlightning_ep|useradmin|wcp).* @@ -80,11 +80,11 @@ - ^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).* + ^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lma|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).* - ^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).* + ^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lma|lsr|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*