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

Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.2.2-el7

Browse source
This commit is contained in:
Michael James 2016-12-07 00:28:17 +00:00
commit b58900de0f
2 changed files with 15 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
build/deploy.edex.awips2/esb/bin/setup.env
View file

@ -1,38 +1,21 @@
### EDEX localization related variables ###
export AW_SITE_IDENTIFIER=BOU export AW_SITE_IDENTIFIER=BOU
## Cluster id can be set to the cluster's id (example:tbw for dx1-tbwo) export EDEX_SERVER=localhost
## it will be autogenerated if not set
export CLUSTER_ID=NCF
# Change the NCF_HOST to be the IP address of the server acting as the NCF server
export DATADELIVERY_HOST=thredds.ucar.edu
export EBXML_REGISTRY_FEDERATION_ENABLED=true
export EBXML_REGISTRY_WEBSERVER_PORT=80
export EBXML_THRIFT_SERVICE_PORT=9588
# database names # database
export DC_DB_NAME=dc_ob7oax export DC_DB_NAME=dc_ob7oax
export FXA_DB_NAME=fxatext export FXA_DB_NAME=fxatext
export HM_DB_NAME=hmdb export HM_DB_NAME=hmdb
export IH_DB_NAME=hd_ob92oax export IH_DB_NAME=hd_ob92oax
# Resolve conflict on AFOS PILs by finding site with first letter in the following order.
export PREFERRED_AFOS_FIRST_LETTER="KCPTXM"
### end of localization variables ###
# setup environment for HPE
export DATA_ARCHIVE_ROOT=/awips2/data_store export DATA_ARCHIVE_ROOT=/awips2/data_store
# setup db connections # postgres connection
export DB_ADDR=localhost export DB_ADDR=${EDEX_SERVER}
export DB_PORT=5432 export DB_PORT=5432
# setup connection to qpid # pypies hdf5 connection
export BROKER_ADDR=localhost export PYPIES_SERVER=http://${EDEX_SERVER}:9582
export BROKER_ADDR=${EDEX_SERVER}
# setup hdf5 connection if pypies is enabled
export PYPIES_SERVER=http://${BROKER_ADDR}:9582
# moved here from environment.xml
# these values are returned to clients that contact the localization service # these values are returned to clients that contact the localization service
export HTTP_PORT=9581 export HTTP_PORT=9581
export HTTP_SERVER_PATH=/services export HTTP_SERVER_PATH=/services
@ -42,18 +25,16 @@ export JMS_VIRTUALHOST=edex
export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST} export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST}
export RADAR_SERVER=tcp://${BROKER_ADDR}:8813 export RADAR_SERVER=tcp://${BROKER_ADDR}:8813
# set the AWIPS II shared directory # data delivery config
#export CLUSTER_ID=NCF
#export DATADELIVERY_HOST=thredds.ucar.edu
#export EBXML_REGISTRY_FEDERATION_ENABLED=true
#export EBXML_REGISTRY_WEBSERVER_PORT=80
#export EBXML_THRIFT_SERVICE_PORT=9588
# hydroapps config
export SHARE_DIR=/awips2/edex/data/share export SHARE_DIR=/awips2/edex/data/share
# set the AWIPS II temporary directory
export TEMP_DIR=/awips2/edex/data/tmp export TEMP_DIR=/awips2/edex/data/tmp
# set hydroapps directory path
export apps_dir=${SHARE_DIR}/hydroapps export apps_dir=${SHARE_DIR}/hydroapps
# site identifier for hydroapps
export SITE_IDENTIFIER=${AW_SITE_IDENTIFIER} export SITE_IDENTIFIER=${AW_SITE_IDENTIFIER}
# set Fax environment variables pointing to ldad@ls1
export LDAD_EXTERNAL_HOME=/ldad
export LDAD_EXTERNAL_PUBLIC=/data/ldad/public
export AWIPS2_TEMP=/awips2/tmp export AWIPS2_TEMP=/awips2/tmp

8
rpms/awips2.cave/Installer.cave/component.spec
View file

@ -132,14 +132,6 @@ unzip %{_component_zip_file_name}
rm -f %{_component_zip_file_name} rm -f %{_component_zip_file_name}
%pre %pre
# /awips2/cave must not exist.
if [ -d /awips2/cave ]; then
# TODO: need to make CAVE RPMs do a better job of cleaning up files that they are
# responsible for.
echo -e "\e[1;31mERROR: the /awips2/cave directory already exists. /awips2/cave\e[m"
echo -e "\e[1;31m will be removed.\e[m"
rm -rf /awips2/cave
fi
%post %post
# We need to create a link to the python shared library if it does not exist. # We need to create a link to the python shared library if it does not exist.