From 2527c5ac75dd7225302d4fa177994d8d530a6bf4 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Wed, 11 May 2022 19:32:44 -0400
Subject: [PATCH] debian: Specify the correct paths for pgsql

Correct the paths for the following defaults:
- OCF_RESKEY_pgctl_default
- OCF_RESKEY_pgdata_default
- OCF_RESKEY_socketdir_default

Test Plan
PASS Build resource-agents package
PASS Build ISO
PASS Unlock system

Story: 2009101
Task: 43317

Depends-On: https://review.opendev.org/c/starlingx/utilities/+/840497

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I8eab1ff7a39222dce9c2b6c0094338e70c03c1e4
---
 ...h-postgresql-environment-for-Debian.patch} | 39 ++++++++++++++-----
 .../debian/patches/series                     |  2 +-
 2 files changed, 30 insertions(+), 11 deletions(-)
 rename base/cluster-resource-agents/debian/patches/{pgsql.patch => 0006-Patch-postgresql-environment-for-Debian.patch} (70%)

diff --git a/base/cluster-resource-agents/debian/patches/pgsql.patch b/base/cluster-resource-agents/debian/patches/0006-Patch-postgresql-environment-for-Debian.patch
similarity index 70%
rename from base/cluster-resource-agents/debian/patches/pgsql.patch
rename to base/cluster-resource-agents/debian/patches/0006-Patch-postgresql-environment-for-Debian.patch
index 0b7a006b5..150566713 100644
--- a/base/cluster-resource-agents/debian/patches/pgsql.patch
+++ b/base/cluster-resource-agents/debian/patches/0006-Patch-postgresql-environment-for-Debian.patch
@@ -1,24 +1,43 @@
-From d50bcc4bb667e6b63e55ae4b788391c78a162d9f Mon Sep 17 00:00:00 2001
+From be107484af12c6c4875febd6fe1a6b987ecec587 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 15:12:59 -0400
-Subject: [PATCH] WRS: Patch1111: pgsql.patch
+Subject: [PATCH 06/13] Patch postgresql environment for Debian
 
+Adapt CentOS patch to Debian.
+
+Signed-off-by: Scott Little <scott.little@windriver.com>
+Signed-off-by: Charles Short <charles.short@windriver.com>
+Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
 ---
- heartbeat/pgsql | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
+ heartbeat/pgsql | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
 
 diff --git a/heartbeat/pgsql b/heartbeat/pgsql
-index cce4e1c..38949eb 100755
+index cce4e1c..87bc486 100755
 --- a/heartbeat/pgsql
 +++ b/heartbeat/pgsql
-@@ -46,6 +46,7 @@ get_pgsql_param() {
- OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl
+@@ -43,9 +43,10 @@ get_pgsql_param() {
+ }
+ 
+ # Defaults
+-OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl
++OCF_RESKEY_pgctl_default=/usr/lib/postgresql/13/bin/pg_ctl
  OCF_RESKEY_psql_default=/usr/bin/psql
- OCF_RESKEY_pgdata_default=/var/lib/pgsql/data
+-OCF_RESKEY_pgdata_default=/var/lib/pgsql/data
++OCF_RESKEY_pgdata_default=/var/lib/postgresql/13/main/
 +OCF_RESKEY_pgconf_default=/etc/postgresql
  OCF_RESKEY_pgdba_default=postgres
  OCF_RESKEY_pghost_default=""
  OCF_RESKEY_pgport_default=5432
+@@ -54,7 +55,7 @@ OCF_RESKEY_start_opt_default=""
+ OCF_RESKEY_ctl_opt_default=""
+ OCF_RESKEY_pgdb_default=template1
+ OCF_RESKEY_logfile_default=/dev/null
+-OCF_RESKEY_socketdir_default=""
++OCF_RESKEY_socketdir_default="/var/run/postgresql"
+ OCF_RESKEY_stop_escalate_default=90
+ OCF_RESKEY_monitor_user_default=""
+ OCF_RESKEY_monitor_password_default=""
 @@ -79,11 +80,12 @@ OCF_RESKEY_replication_slot_name_default=""
  : ${OCF_RESKEY_pgctl=${OCF_RESKEY_pgctl_default}}
  : ${OCF_RESKEY_psql=${OCF_RESKEY_psql_default}}
@@ -61,7 +80,7 @@ index cce4e1c..38949eb 100755
          fi
      fi
  
-+    # WRS: Create an unversioned symlink under /var/run so SM can easily
++    # STX: Create an unversioned symlink under /var/run so SM can easily
 +    # find the PID file.
 +    if [ ! -h $PIDFILE_SYMLINK ]; then
 +      /bin/ln -s $PIDFILE $PIDFILE_SYMLINK
@@ -84,5 +103,5 @@ index cce4e1c..38949eb 100755
  USE_STANDBY_SIGNAL=false
  
 -- 
-2.17.1
+2.36.1
 
diff --git a/base/cluster-resource-agents/debian/patches/series b/base/cluster-resource-agents/debian/patches/series
index ba439b4b5..fa9eaecca 100644
--- a/base/cluster-resource-agents/debian/patches/series
+++ b/base/cluster-resource-agents/debian/patches/series
@@ -4,7 +4,7 @@ ipaddr2_check_if_state.patch
 copyright.patch
 umount-in-namespace.patch
 lvm_vg_activation.patch
-pgsql.patch
+0006-Patch-postgresql-environment-for-Debian.patch
 Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
 ocf-shellfuncs_change_logtag.patch
 lvm_cleanup_refs_on_stop.patch