From: David Corlette <[email protected]> --- heartbeat/pgsql | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/heartbeat/pgsql b/heartbeat/pgsql index b57488d..9c66d56 100755 --- a/heartbeat/pgsql +++ b/heartbeat/pgsql @@ -6,6 +6,7 @@ # Authors: Serge Dubrouski ([email protected]) -- original RA # Florian Haas ([email protected]) -- makeover # Takatoshi MATSUO ([email protected]) -- support replication +# David Corlette ([email protected]) -- add support for non-standard library locations and non-standard port # # Copyright: 2006-2012 Serge Dubrouski <[email protected]> # and other Linux-HA contributors @@ -40,6 +41,7 @@ OCF_RESKEY_pgdata_default=/var/lib/pgsql/data OCF_RESKEY_pgdba_default=postgres OCF_RESKEY_pghost_default="" OCF_RESKEY_pgport_default=5432 +OCF_RESKEY_pglibs_default=/usr/lib OCF_RESKEY_start_opt_default="" OCF_RESKEY_pgdb_default=template1 OCF_RESKEY_logfile_default=/dev/null @@ -67,6 +69,7 @@ OCF_RESKEY_stop_escalate_in_slave_default=30 : ${OCF_RESKEY_pgdba=${OCF_RESKEY_pgdba_default}} : ${OCF_RESKEY_pghost=${OCF_RESKEY_pghost_default}} : ${OCF_RESKEY_pgport=${OCF_RESKEY_pgport_default}} +: ${OCF_RESKEY_pglibs=${OCF_RESKEY_pglibs_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_pgdata}/postgresql.conf} : ${OCF_RESKEY_start_opt=${OCF_RESKEY_start_opt_default}} : ${OCF_RESKEY_pgdb=${OCF_RESKEY_pgdb_default}} @@ -185,6 +188,14 @@ Port where PostgreSQL is listening <content type="integer" default="${OCF_RESKEY_pgport_default}" /> </parameter> +<parameter name="pglibs" unique="0" required="0"> +<longdesc lang="en"> +The location of the Postgres libraries. +</longdesc> +<shortdesc lang="en">pglibs</shortdesc> +<content type="string" default="${OCF_RESKEY_pglibs_default}" /> +</parameter> + <parameter name="monitor_user" unique="0" required="0"> <longdesc lang="en"> PostgreSQL user that pgsql RA will user for monitor operations. If it's not set @@ -1691,6 +1702,19 @@ else fi fi +if [ -n "$OCF_RESKEY_pgport" ]; then + export PGPORT=$OCF_RESKEY_pgport +fi + +if [ -n "$OCF_RESKEY_pglibs" ]; then + if [ -n "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OCF_RESKEY_pglibs + else + export LD_LIBRARY_PATH=$OCF_RESKEY_pglibs + fi +fi + + # What kind of method was invoked? case "$1" in status) if pgsql_status -- 1.6.0.2 _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
