From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 6 Jun 2023 11:42:17 +0000 (+0200)
Subject: fix #4759: run ceph-crash daemon with www-data group for access to conf
X-Git-Url: https://git.proxmox.com/?p=ceph.git;a=commitdiff_plain;h=f72c698a55905d93e9a0b7b95674616547deba8a

fix #4759: run ceph-crash daemon with www-data group for access to conf

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch b/patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
new file mode 100644
index 000000000..1e9b1a5f6
--- /dev/null
+++ b/patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Tue, 6 Jun 2023 13:36:13 +0200
+Subject: [PATCH] fix #4759: run ceph-crash daemon with www-data group for
+ access to conf
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ src/ceph-crash.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ceph-crash.in b/src/ceph-crash.in
+index 0e02837fa..010d6ea2e 100755
+--- a/src/ceph-crash.in
++++ b/src/ceph-crash.in
+@@ -97,7 +97,7 @@ def drop_privs():
+     if os.getuid() == 0:
+         try:
+             ceph_uid = pwd.getpwnam("ceph").pw_uid
+-            ceph_gid = grp.getgrnam("ceph").gr_gid
++            ceph_gid = grp.getgrnam("www-data").gr_gid # ensure access to config in pmxcfs
+             os.setgroups([])
+             os.setgid(ceph_gid)
+             os.setuid(ceph_uid)
diff --git a/patches/series b/patches/series
index 7be383fba..56208f843 100644
--- a/patches/series
+++ b/patches/series
@@ -13,3 +13,4 @@
 0017-python3.10-pep-620.patch
 0018-fix-lib-fmt-v9-compat.patch
 0019-define-iterators-without-std-iterator.patch
+0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch