xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unidata_18.2.1' into unidata_18.2.1-osx-merge

Browse source 
Bring over most recent changes from this week to the osx branch
This commit is contained in:
Shay Carter 2021-12-10 12:45:19 -07:00
commit 921e3f26ef
5 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
awips_install.sh
View file

@ -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}
@ -441,7 +441,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

6
edexOsgi/deploy.edex.awips2/esb/conf/modes/modes.xml
View file

@ -62,7 +62,7 @@
<includeMode>ingest</includeMode>
<includeMode>pluginExclude</includeMode>
<includeMode>goesrExclude</includeMode>
<exclude>.*(lma|airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).*</exclude>
<exclude>.*(airmet|atcf|aww|convsigmet|gfe|grid|hydro|intlsigmet|modis|ncpafm|ncuair|profiler|netcdf-grid).*</exclude>
<exclude>.*(nonconvsigmet|satellite|sgwh|ssha|stats|stormtrack|textlightning_ep|useradmin|wcp).*</exclude>
</mode>
@ -80,11 +80,11 @@
</mode>
<mode name="pluginExclude">
<exclude>^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*</exclude>
<exclude>^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lma|lsr|modelsounding|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*</exclude>
</mode>
<mode name="pluginModelSoundingExclude">
<exclude>^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lsr|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*</exclude>
<exclude>^(acars|activetable|bufr|ccfp|climate|convectprob|cwa|geodb|goessounding|lma|lsr|nucaps|obs|poes|redbook|sfcobs|svrwx|tc|vaa|viirs|warning).*</exclude>
</mode>
<mode name="goesrExclude">

16
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -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/

0
rpms/awips2.edex/Installer.edex/programs/logs/updateNDM.log Normal file
View file

6
rpms/awips2.upc/Installer.awips/programs/edex
View file

@ -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
}