import OL resource-agents-4.16.0-22.el10_1.7
This commit is contained in:
parent
0fe0bab733
commit
4eeaacdd08
66
RHEL-112443-1-nginx-fix-validate-warnings.patch
Normal file
66
RHEL-112443-1-nginx-fix-validate-warnings.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From 10d61eb3d8d8adcd0356fd855cbba4589027bfcb Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 4 Nov 2025 12:58:18 +0100
|
||||
Subject: [PATCH] nginx: fix ls-redirection, mute non-errors in validate-all,
|
||||
and set unique intervals for monitor actions
|
||||
|
||||
---
|
||||
heartbeat/nginx | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/nginx b/heartbeat/nginx
|
||||
index cb1c6ec27a..0f856175de 100755
|
||||
--- a/heartbeat/nginx
|
||||
+++ b/heartbeat/nginx
|
||||
@@ -251,7 +251,7 @@ nginxcat() {
|
||||
close(cmd);
|
||||
}
|
||||
function listfiles(pattern, cmd,f) {
|
||||
- cmd="ls "pattern" 2>/dev/null";
|
||||
+ cmd="ls "pattern;
|
||||
while( ( cmd | getline f ) > 0 ) {
|
||||
printfile(f);
|
||||
}
|
||||
@@ -271,7 +271,7 @@ nginxcat() {
|
||||
return !system("test -d \""s"\"");
|
||||
}
|
||||
{ procline(); }
|
||||
- ' $1 |
|
||||
+ ' $1 2> /dev/null |
|
||||
sed 's/#.*//;s/[[:blank:]]*$//;s/^[[:blank:]]*//' |
|
||||
grep -v '^$'
|
||||
}
|
||||
@@ -800,8 +800,8 @@ Extra options to apply when starting nginx.
|
||||
<action name="status" timeout="30s" />
|
||||
<action name="monitor" timeout="30s" depth="0" interval="10s" />
|
||||
<action name="monitor" timeout="30s" depth="10" interval="30s" />
|
||||
-<action name="monitor" timeout="45s" depth="20" />
|
||||
-<action name="monitor" timeout="60s" depth="30" />
|
||||
+<action name="monitor" timeout="45s" depth="20" interval="60s" />
|
||||
+<action name="monitor" timeout="60s" depth="30" interval="61s" />
|
||||
<action name="meta-data" timeout="5s" />
|
||||
<action name="validate-all" timeout="5s" />
|
||||
</actions>
|
||||
@@ -847,11 +847,11 @@ validate_all_nginx() {
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
fi
|
||||
if
|
||||
- ocf_run $NGINXD $OPTIONS -t -c $CONFIGFILE
|
||||
+ ocf_run $NGINXD $OPTIONS -q -t -c $CONFIGFILE
|
||||
then
|
||||
: Cool $NGINXD likes $CONFIGFILE
|
||||
else
|
||||
- ocf_exit_reason "$NGINXD $OPTIONS -t -c $CONFIGFILE reported a configuration error."
|
||||
+ ocf_exit_reason "$NGINXD $OPTIONS -q -t -c $CONFIGFILE reported a configuration error."
|
||||
return $OCF_ERR_CONFIGURED
|
||||
fi
|
||||
return $OCF_SUCCESS
|
||||
@@ -908,7 +908,7 @@ then
|
||||
if
|
||||
[ ! -z "$OCF_RESKEY_httpd" ]
|
||||
then
|
||||
- ocf_log info "Using $NGINXD as nginx"
|
||||
+ ocf_log debug "Using $NGINXD as nginx"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
From 2d30397ad166156da3599297697889ec7229e402 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 18 Nov 2025 12:03:50 +0100
|
||||
Subject: [PATCH] nginx: restore SELinux context for pid-file during
|
||||
validate-all
|
||||
|
||||
---
|
||||
heartbeat/nginx | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/heartbeat/nginx b/heartbeat/nginx
|
||||
index 0f856175d..a963ca093 100755
|
||||
--- a/heartbeat/nginx
|
||||
+++ b/heartbeat/nginx
|
||||
@@ -850,6 +850,7 @@ validate_all_nginx() {
|
||||
ocf_run $NGINXD $OPTIONS -q -t -c $CONFIGFILE
|
||||
then
|
||||
: Cool $NGINXD likes $CONFIGFILE
|
||||
+ which restorecon > /dev/null 2>&1 && selinuxenabled && restorecon "$PidFile"
|
||||
else
|
||||
ocf_exit_reason "$NGINXD $OPTIONS -q -t -c $CONFIGFILE reported a configuration error."
|
||||
return $OCF_ERR_CONFIGURED
|
||||
@ -45,7 +45,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.16.0
|
||||
Release: 22%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
|
||||
Release: 22%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.7
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
@ -81,6 +81,8 @@ Patch28: RHEL-88431-1-podman-etcd-new-ra.patch
|
||||
Patch29: RHEL-88431-2-podman-etcd-remove-unused-actions-from-metadata.patch
|
||||
Patch30: RHEL-88431-3-podman-etcd-fix-listen-peer-urls-binding.patch
|
||||
Patch31: RHEL-113104-podman-etcd-add-oom-parameter.patch
|
||||
Patch51: RHEL-112443-1-nginx-fix-validate-warnings.patch
|
||||
Patch56: RHEL-112443-2-nginx-restore-selinux-context-for-pid-file-during-validate-all-action.patch
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aliyun.patch
|
||||
@ -271,6 +273,8 @@ exit 1
|
||||
%patch -p1 -P 29
|
||||
%patch -p1 -P 30
|
||||
%patch -p1 -P 31
|
||||
%patch -p1 -P 51
|
||||
%patch -p1 -P 56
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch -p1 -P 500
|
||||
@ -601,6 +605,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Fri Dec 19 2025 Alan Steinberg <alan.steinberg@oracle.com> - 4.16.0-22.7
|
||||
- nginx: fix validate warnings, and restore SELinux context for
|
||||
pid-file during validate-all action
|
||||
|
||||
Resolves: RHEL-112443
|
||||
|
||||
* Wed Nov 19 2025 Alan Steinberg <alan.steinberg@oracle.com> - 4.16.0-22.1
|
||||
- podman-etcd: new resource agent
|
||||
- podman-etcd: add oom parameter to be able to tune the Out-Of-Memory (OOM)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user