1 From 386e3919b703c5a3d06edfc5b078ab67604139ab Mon Sep 17 00:00:00 2001
2 From: Scott Little <scott.little@windriver.com>
3 Date: Mon, 2 Oct 2017 15:12:59 -0400
4 Subject: [PATCH 07/13] WRS: Patch1111: pgsql.patch
7 heartbeat/pgsql | 23 ++++++++++++++++++++---
8 1 file changed, 20 insertions(+), 3 deletions(-)
10 diff --git a/heartbeat/pgsql b/heartbeat/pgsql
11 index 768608e..28cc046 100755
14 @@ -46,6 +46,7 @@ get_pgsql_param() {
15 OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl
16 OCF_RESKEY_psql_default=/usr/bin/psql
17 OCF_RESKEY_pgdata_default=/var/lib/pgsql/data
18 +OCF_RESKEY_pgconf_default=/etc/postgresql
19 OCF_RESKEY_pgdba_default=postgres
20 OCF_RESKEY_pghost_default=""
21 OCF_RESKEY_pgport_default=5432
22 @@ -78,11 +79,12 @@ OCF_RESKEY_replication_slot_name_default=""
23 : ${OCF_RESKEY_pgctl=${OCF_RESKEY_pgctl_default}}
24 : ${OCF_RESKEY_psql=${OCF_RESKEY_psql_default}}
25 : ${OCF_RESKEY_pgdata=${OCF_RESKEY_pgdata_default}}
26 +: ${OCF_RESKEY_pgconf=${OCF_RESKEY_pgconf_default}}
27 : ${OCF_RESKEY_pgdba=${OCF_RESKEY_pgdba_default}}
28 : ${OCF_RESKEY_pghost=${OCF_RESKEY_pghost_default}}
29 : ${OCF_RESKEY_pgport=${OCF_RESKEY_pgport_default}}
30 : ${OCF_RESKEY_pglibs=${OCF_RESKEY_pglibs_default}}
31 -: ${OCF_RESKEY_config=${OCF_RESKEY_pgdata}/postgresql.conf}
32 +: ${OCF_RESKEY_config=${OCF_RESKEY_pgconf}/postgresql.conf}
33 : ${OCF_RESKEY_start_opt=${OCF_RESKEY_start_opt_default}}
34 : ${OCF_RESKEY_ctl_opt=${OCF_RESKEY_ctl_opt_default}}
35 : ${OCF_RESKEY_pgdb=${OCF_RESKEY_pgdb_default}}
36 @@ -180,6 +182,14 @@ Path to PostgreSQL data directory.
37 <content type="string" default="${OCF_RESKEY_pgdata_default}" />
40 +<parameter name="pgconf" unique="0" required="0">
42 +Path to PostgreSQL config directory.
44 +<shortdesc lang="en">pgconf</shortdesc>
45 +<content type="string" default="${OCF_RESKEY_pgconf_default}" />
48 <parameter name="pgdba" unique="0" required="0">
50 User that owns PostgreSQL.
51 @@ -243,7 +253,7 @@ SQL script that will be used for monitor operations.
52 Path to the PostgreSQL configuration file for the instance.
54 <shortdesc lang="en">Configuration file</shortdesc>
55 -<content type="string" default="${OCF_RESKEY_pgdata}/postgresql.conf" />
56 +<content type="string" default="${OCF_RESKEY_pgconf}/postgresql.conf" />
59 <parameter name="pgdb" unique="0" required="0">
60 @@ -630,6 +640,12 @@ pgsql_real_start() {
64 + # WRS: Create an unversioned symlink under /var/run so SM can easily
65 + # find the PID file.
66 + if [ ! -h $PIDFILE_SYMLINK ]; then
67 + /bin/ln -s $PIDFILE $PIDFILE_SYMLINK
70 ocf_log info "PostgreSQL is started."
73 @@ -2078,10 +2094,11 @@ then
76 PIDFILE=${OCF_RESKEY_pgdata}/postmaster.pid
77 +PIDFILE_SYMLINK=/var/run/postmaster.pid
78 BACKUPLABEL=${OCF_RESKEY_pgdata}/backup_label
79 RESOURCE_NAME=`echo $OCF_RESOURCE_INSTANCE | cut -d ":" -f 1`
80 PGSQL_WAL_RECEIVER_STATUS_ATTR="${RESOURCE_NAME}-receiver-status"
81 -RECOVERY_CONF=${OCF_RESKEY_pgdata}/recovery.conf
82 +RECOVERY_CONF=${OCF_RESKEY_pgconf}/recovery.conf
83 NODENAME=$(ocf_local_nodename | tr '[A-Z]' '[a-z]')