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

Merge branch 'unidata_14.4.1' of github.com:Unidata/awips2 into unidata_14.4.1

Browse source 
Former-commit-id: 10d772271f
This commit is contained in:
AWIPS User 2015-10-20 13:47:11 -06:00
commit aa28c8b4af
5 changed files with 60 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
installCAVE.sh
View file

@ -5,16 +5,35 @@
#
# 10/15 mjames@ucar.edu Creation
#
#
## Download awips2.repo from the Unidata web server
#
if [ ! -f /etc/yum.repos.d/awips2.repo ]; then
echo ''
echo 'Downloading awips2repo yum file to /etc/yum.repos.d/awips2.repo'
echo ''
wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo
echo "Running 'yum clean all'"
yum clean all
echo ''
fi
echo ''
echo "Running 'yum clean all'"
echo ''
yum clean all
##
## If CAVE is not installed them make sure /awips2/cave/
## and /awips2/alertviz/ are removed before installing.
##
if [[ $(rpm -qa | grep awips2-cave) ]]; then
echo "found CAVE RPMs installed"
else
echo " CAVE RPMs not installled"
echo ""
echo " cleaning up /awips2/cave/, /awips2/alertviz/"
rm -rf /awips2/cave/ /awips2/alertviz/
fi
echo ''
echo "Running 'yum groupinstall awips2-cave'"
echo ''
@ -36,5 +55,4 @@ echo ""
echo " to run cave:"
echo ""
echo " /awips2/cave/cave.sh"
echo ""
exit

21
installEDEX.sh
View file

@ -15,6 +15,22 @@ echo ''
echo "Running 'yum clean all'"
echo ''
yum clean all
if [[ $(rpm -qa | grep awips2-edex) ]]; then
echo "found EDEX RPMs installed"
else
echo " EDEX RPMs not installled"
echo ""
echo " cleaning up /awips2/edex/, /awips2/data/"
rm -rf /awips2/edex/ /awips2/data/
fi
service edex_camel stop
service qpidd stop
service httpd-pypies stop
service edex_postgres stop
echo ''
echo "Running 'yum groupinstall awips2-server'"
echo ''
@ -30,9 +46,4 @@ fi
echo ""
echo "Done..."
echo ""
echo " to run EDEX:"
echo ""
echo " edex start"
echo ' su ldm -c "ldmadmin mkqueue" && su ldm -c "ldmadmin start"'
echo ""
exit

26
rpms/awips2.cave/Installer.alertviz/component.spec
View file

@ -113,23 +113,25 @@ fi
echo -e "\nInstalling A2 gdm PostSession Default script"
scp /etc/gdm/PostSession/awips2VisualizeUtility.sh /etc/gdm/PostSession/Default
pushd . > /dev/null 2>&1
cd /awips2/alertviz/plugins
#pushd . > /dev/null 2>&1
#cd /awips2/alertviz/plugins
# Forcefully unzip: org.eclipse.swt.gtk.linux.x86_64_*.jar
# : if x86_64
if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then
mkdir org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
unzip -qq org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar \
-d org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
rm -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
mv org.eclipse.swt.gtk.linux.x86_64_%{_swt_version} \
org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
fi
popd > /dev/null 2>&1
#if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then
# mkdir org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
# unzip -qq org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar \
# -d org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
# rm -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
# mv org.eclipse.swt.gtk.linux.x86_64_%{_swt_version} \
# org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
#fi
#
#popd > /dev/null 2>&1
%preun
rm -rf org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
%postun
rm -rf org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
%clean
rm -rf ${RPM_BUILD_ROOT}

2
rpms/awips2.upc/Installer.edex-upc/component.spec
View file

@ -16,7 +16,7 @@ Packager: Michael James
AutoReq: no
Requires: awips2-tools, awips2-edex-configuration, awips2-database-standalone-configuration
Requires: awips2-qpid-java-broker, awips2-postgresql, awips2-httpd-pypies
Requires: awips2-qpid-java-broker, awips2-postgresql, awips2-httpd-pypies, awips2-ldm
Requires: ksh, libstdc++(x86-32), libgfortran(x86-32)
provides: awips2-edex-upc

9
rpms/awips2.upc/Installer.edex-upc/programs/edex
View file

@ -40,7 +40,7 @@ EDEX_ENV_FILE=${EDEX_PATH}/bin/setup.env
LDMD_CONF=${AWIPS_HOME}/ldm/etc/ldmd.conf
# valid options
options=( 'status' 'start' 'stop' 'log' 'setup' 'test' 'purge')
options=( 'status' 'start' 'stop' 'log' 'setup' 'purge')
nopts=${options[@]}
# find interface for routeable IPs
@ -202,7 +202,6 @@ edit_pg() { # edex pg_hba.conf
edit_ldm() { # edex ldmd.conf and registry.xml
sed -i.setup_$YMD 's/EDEX_HOSTNAME/'$HOSTNAME'/g' $LDMD_CONF
regutil -s "1500" /queue/size
echo '[edit] Hostname '$HOSTNAME' added to '$LDMD_CONF
}
@ -329,6 +328,7 @@ edex_start() { # start all edex services
su -c "service edex_postgres start"
su -c "service httpd-pypies start"
su -c "service qpidd start"
edex_purge_reset
su -c "service edex_camel start"
su -c "service edex_ldm start"
}
@ -344,7 +344,7 @@ edex_stop() { # stop all edex services
edex_purge() {
if [ "${args[1]}" == 'reset' ]; then
su awips -c 'psql metadata -c "update purgejobs set failedcount = 0;"' >& /dev/null
edex_purge_reset
echo ' EDEX purge has been reset'
exit;
else
@ -355,6 +355,9 @@ edex_purge() {
exit;
fi
}
edex_purge_reset() {
su awips -c 'psql metadata -c "update purgejobs set failedcount = 0;"' >& /dev/null
}
edex_options() { # print out options for this programs
echo ''