parent
570c652638
commit
0bbdbc62a0
5 changed files with 8 additions and 17 deletions
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
# "local" is for Unix domain socket connections only
|
# "local" is for Unix domain socket connections only
|
||||||
local fxatext all trust
|
local fxatext all trust
|
||||||
local hd_ob83oax all trust
|
local hd_ob92oax all trust
|
||||||
local dc_ob7oax all trust
|
local dc_ob7oax all trust
|
||||||
local metadata all trust
|
local metadata all trust
|
||||||
local maps all trust
|
local maps all trust
|
||||||
|
@ -76,30 +76,21 @@ local ebxml all trust
|
||||||
# IPv4 local connections:
|
# IPv4 local connections:
|
||||||
host fxatext all 127.0.0.1/32 trust
|
host fxatext all 127.0.0.1/32 trust
|
||||||
host fxatext all 147.18.136.0/24 trust
|
host fxatext all 147.18.136.0/24 trust
|
||||||
host fxatext all 162.0.0.0/8 trust
|
host hd_ob92oax all 127.0.0.1/32 trust
|
||||||
host hd_ob83oax all 127.0.0.1/32 trust
|
host hd_ob92oax all 147.18.136.0/24 trust
|
||||||
host hd_ob83oax all 147.18.136.0/24 trust
|
|
||||||
host hd_ob83oax all 162.0.0.0/8 trust
|
|
||||||
host dc_ob7oax all 127.0.0.1/32 trust
|
host dc_ob7oax all 127.0.0.1/32 trust
|
||||||
host dc_ob7oax all 147.18.136.0/24 trust
|
host dc_ob7oax all 147.18.136.0/24 trust
|
||||||
host dc_ob7oax all 162.0.0.0/8 trust
|
|
||||||
host hmdb all 127.0.0.1/32 trust
|
host hmdb all 127.0.0.1/32 trust
|
||||||
host hmdb all 147.18.136.0/24 trust
|
host hmdb all 147.18.136.0/24 trust
|
||||||
host hmdb all 162.0.0.0/8 trust
|
|
||||||
host metadata all 127.0.0.1/32 md5
|
host metadata all 127.0.0.1/32 md5
|
||||||
host metadata all 147.18.136.0/24 md5
|
host metadata all 147.18.136.0/24 md5
|
||||||
host metadata all 162.0.0.0/8 md5
|
|
||||||
host maps all 127.0.0.1/32 md5
|
host maps all 127.0.0.1/32 md5
|
||||||
host maps all 147.18.136.0/24 md5
|
host maps all 147.18.136.0/24 md5
|
||||||
host maps all 162.0.0.0/8 md5
|
|
||||||
host postgres all 127.0.0.1/32 md5
|
host postgres all 127.0.0.1/32 md5
|
||||||
host postgres all 147.18.136.0/24 md5
|
host postgres all 147.18.136.0/24 md5
|
||||||
host postgres all 162.0.0.0/8 md5
|
|
||||||
host ncep all 127.0.0.1/32 md5
|
host ncep all 127.0.0.1/32 md5
|
||||||
host ncep all 147.18.136.0/24 md5
|
host ncep all 147.18.136.0/24 md5
|
||||||
host ncep all 162.0.0.0/8 md5
|
|
||||||
host ebxml all 127.0.0.1/32 trust
|
host ebxml all 127.0.0.1/32 trust
|
||||||
host ebxml all 147.18.136.0/24 trust
|
host ebxml all 147.18.136.0/24 trust
|
||||||
host ebxml all 162.0.0.0/8 trust
|
|
||||||
# IPv6 local connections:
|
# IPv6 local connections:
|
||||||
host all all ::1/128 md5
|
host all all ::1/128 md5
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
<!-- Set the ihfs database -->
|
<!-- Set the ihfs database -->
|
||||||
<property name="def.ih.db.name" value="hd_ob83oax"/>
|
<property name="def.ih.db.name" value="hd_ob92oax"/>
|
||||||
<condition property="ih.db.name" value="%ihDbName" else="${def.ih.db.name}">
|
<condition property="ih.db.name" value="%ihDbName" else="${def.ih.db.name}">
|
||||||
<isset property="installer"/>
|
<isset property="installer"/>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
# --------TOKENS THAT SHOULD BE AT ALL SITES-----------
|
# --------TOKENS THAT SHOULD BE AT ALL SITES-----------
|
||||||
# database selection tokens
|
# database selection tokens
|
||||||
db_name : hd_ob83oax # ihfs database name
|
db_name : hd_ob92oax # ihfs database name
|
||||||
damcat_db_name : dc_ob7oax # Dam Catalog database name
|
damcat_db_name : dc_ob7oax # Dam Catalog database name
|
||||||
|
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
|
|
|
@ -316,7 +316,7 @@ function restoreHydroDb()
|
||||||
# update pg_hba.conf
|
# update pg_hba.conf
|
||||||
|
|
||||||
local default_damcat="dc_ob7oax"
|
local default_damcat="dc_ob7oax"
|
||||||
local default_ihfs="hd_ob83oax"
|
local default_ihfs="hd_ob92oax"
|
||||||
local pg_hba_conf="/awips2/data/pg_hba.conf"
|
local pg_hba_conf="/awips2/data/pg_hba.conf"
|
||||||
|
|
||||||
# update the entry for the damcat database
|
# update the entry for the damcat database
|
||||||
|
|
|
@ -96,7 +96,7 @@ if [ -f "${SETUP_ENV_NEW}" ]; then
|
||||||
updateSetupEnv "${DC_DB_NAME}" "DC_DB_NAME" "dc_ob7oax"
|
updateSetupEnv "${DC_DB_NAME}" "DC_DB_NAME" "dc_ob7oax"
|
||||||
updateSetupEnv "${FXA_DB_NAME}" "FXA_DB_NAME" "fxatext"
|
updateSetupEnv "${FXA_DB_NAME}" "FXA_DB_NAME" "fxatext"
|
||||||
updateSetupEnv "${HM_DB_NAME}" "HM_DB_NAME" "hmdb"
|
updateSetupEnv "${HM_DB_NAME}" "HM_DB_NAME" "hmdb"
|
||||||
updateSetupEnv "${IH_DB_NAME}" "IH_DB_NAME" "hd_ob83oax"
|
updateSetupEnv "${IH_DB_NAME}" "IH_DB_NAME" "hd_ob92oax"
|
||||||
updateSetupEnv "${DATA_ARCHIVE_ROOT}" "DATA_ARCHIVE_ROOT" "/tmp/sbn"
|
updateSetupEnv "${DATA_ARCHIVE_ROOT}" "DATA_ARCHIVE_ROOT" "/tmp/sbn"
|
||||||
updateSetupEnv "${DB_ADDR}" "DB_ADDR" "localhost"
|
updateSetupEnv "${DB_ADDR}" "DB_ADDR" "localhost"
|
||||||
updateSetupEnv "${DB_PORT}" "DB_PORT" "5432"
|
updateSetupEnv "${DB_PORT}" "DB_PORT" "5432"
|
||||||
|
|
Loading…
Add table
Reference in a new issue