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

- nginx: fix validate warnings, and restore SELinux context for

Browse Source 
pid-file during validate-all action

  Resolves: RHEL-112443
This commit is contained in:
Oyvind Albrigtsen 2025-11-18 15:30:31 +01:00
parent a7e8b855e0
commit 220cf2c062
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
RHEL-112443-nginx-fix-validate-warnings.patch → RHEL-112443-1-nginx-fix-validate-warnings.patch
View File

22
RHEL-112443-2-nginx-restore-selinux-context-for-pid-file-during-validate-all-action.patch Normal file
View File

@ -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

15
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0
Release: 41%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 42%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
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
@ -100,11 +100,12 @@ Patch47: RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch48: RHEL-109486-2-nfsserver-fix-error-message.patch
Patch49: RHEL-109013-2-powervs-move-ip-add-iflabel-parameter.patch
Patch50: RHEL-102779-pgsqlms-fix-validate-warnings.patch
Patch51: RHEL-112443-nginx-fix-validate-warnings.patch
Patch51: RHEL-112443-1-nginx-fix-validate-warnings.patch
Patch52: RHEL-121985-Filesystem-speed-up-get-PIDs.patch
Patch53: RHEL-126791-storage_mon-fix-handling-of-4k-block-devices.patch
Patch54: RHEL-127840-podman-etcd-exclude-stopping-resources-from-active-count.patch
Patch55: RHEL-126083-podman-etcd-add-container-crash-detection-with-coordinated-recovery.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
@ -331,6 +332,7 @@ exit 1
%patch -p1 -P 53
%patch -p1 -P 54
%patch -p1 -P 55 -F2
%patch -p1 -P 56
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -663,6 +665,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Nov 18 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-42
- nginx: fix validate warnings, and restore SELinux context for
pid-file during validate-all action
Resolves: RHEL-112443
* Thu Nov 13 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-41
- podman-etcd: exclude stopping resources from active count
- podman-etcd: add container crash detection with coordinated recovery
@ -676,10 +684,9 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
* Tue Nov 4 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-39
- pgsqlms: fix validate warnings
- nginx: fix validate warnings
- Filesystem: speed up get PIDs
Resolves: RHEL-102779, RHEL-112443, RHEL-121985
Resolves: RHEL-102779, RHEL-121985
* Mon Nov 3 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-38
- powervs-move-ip: new resource agent