rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- MailTo: add s-nail support for multiple recipients

Browse Source 
- oracle: improve monpassword description

  Resolves: RHEL-118621, RHEL-64949
This commit is contained in:
Oyvind Albrigtsen 2025-10-29 16:52:26 +01:00
parent 733bfd4a85
commit b5fe511b4d
3 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
RHEL-118621-MailTo-add-s-nail-support-for-multiple-recipients.patch Normal file
View File

@ -0,0 +1,36 @@
From 1e546b85010e5fdbf7a0f31207dce144c14c50ec Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 29 Oct 2025 15:17:30 +0100
Subject: [PATCH] MailTo: add s-nail support for multiple recipients
---
heartbeat/MailTo | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/heartbeat/MailTo b/heartbeat/MailTo
index 56940bafaa..a3ee6a04c8 100755
--- a/heartbeat/MailTo
+++ b/heartbeat/MailTo
@@ -92,12 +92,16 @@ END
}
MailProgram() {
- $MAILCMD -s "$1" "$email" <<EOF
- $Subject
-
- Command line was:
- $ARGS
-EOF
+ local body="\
+$Subject
+
+Command line was:
+$ARGS"
+ if $MAILCMD -V | grep -q "^s-nail"; then
+ printf "$body" | $MAILCMD -s "$1" $(echo $email | sed "s/,\s*/ /g")
+ else
+ printf "$body" | $MAILCMD -s "$1" "$email"
+ fi
return $?
}

23
RHEL-64949-oracle-improve-monpassword-description.patch Normal file
View File

@ -0,0 +1,23 @@
From eac983c14f4695f491fe430a78d8d18a1481c60c Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 29 Oct 2025 15:15:54 +0100
Subject: [PATCH] oracle: improve monpassword description
---
heartbeat/oracle | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/heartbeat/oracle b/heartbeat/oracle
index 8cf4e3649c..c85e499833 100755
--- a/heartbeat/oracle
+++ b/heartbeat/oracle
@@ -132,8 +132,7 @@ that the password for this user does not expire.
<longdesc lang="en">
Password for the monitoring user. Make sure
that the password for this user does not expire.
-Need to explicitly set a password to a new monitor
-user for the security reason.
+Set to avoid using the agents default password for "monuser".
</longdesc>
<shortdesc lang="en">monpassword</shortdesc>
<content type="string" default="$OCF_RESKEY_monpassword_default" />

12
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 91%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 92%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -179,6 +179,8 @@ Patch126: RHEL-118624-db2-use-reintegration-flag-to-avoid-race-condition-on-clus
Patch127: RHEL-123887-podman-etcd-certificate-rotation.patch
Patch128: RHEL-123906-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex.patch
Patch129: RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch
Patch130: RHEL-118621-MailTo-add-s-nail-support-for-multiple-recipients.patch
Patch131: RHEL-64949-oracle-improve-monpassword-description.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -453,6 +455,8 @@ exit 1
%patch -p1 -P 127
%patch -p1 -P 128
%patch -p1 -P 129
%patch -p1 -P 130
%patch -p1 -P 131
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -785,6 +789,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Wed Oct 29 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-92
- MailTo: add s-nail support for multiple recipients
- oracle: improve monpassword description
Resolves: RHEL-118621, RHEL-64949
* Wed Oct 29 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-91
- db2: add "skip_basic_sql_health_check" parameter to avoid failing on
systems with high load