RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpm,deb: drop /etc/sudoers.d/cephadm

Browse Source 
Current behavior (without this patch) is:

1. cephadm package installs cephadm at /usr/sbin/cephadm
2. cephadm package installs /etc/sudoers.d/cephadm
3. !!! BUT this file refers to a non-existent executable (/usr/bin/cephadm) !!!
4. the PR that introduced this sudoers file (and this discrepancy) was merged in 2019
5. nobody noticed the discrepancy until now

My conclusion: the file /etc/sudoers.d/cephadm is not needed for cephadm to
work.

Fixes: https://tracker.ceph.com/issues/47112
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2020-09-01 20:38:47 +02:00
parent a8bf3e9b2f
commit c1783d3d8f
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph.spec.in
View File

@ -1256,7 +1256,6 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
# sudoers.d
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm
%if 0%{?rhel} >= 8
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@ -1413,7 +1412,6 @@ exit 0
%files -n cephadm
%{_sbindir}/cephadm
%{_mandir}/man8/cephadm.8*
%{_sysconfdir}/sudoers.d/cephadm
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys

1
debian/cephadm.install vendored
View File

@ -1,3 +1,2 @@
usr/sbin/cephadm
usr/share/man/man8/cephadm.8
etc/sudoers.d/cephadm

1
debian/rules vendored
View File

@ -62,7 +62,6 @@ override_dh_auto_install:
install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
install -D -m 600 sudoers.d/ceph-osd-smartctl $(DESTDIR)/etc/sudoers.d/ceph-osd-smartctl
install -D -m 600 sudoers.d/cephadm $(DESTDIR)/etc/sudoers.d/cephadm
install -D -m 755 src/tools/rbd_nbd/rbd-nbd_quiesce $(DESTDIR)/usr/libexec/rbd-nbd/rbd-nbd_quiesce
install -m 755 src/cephadm/cephadm $(DESTDIR)/usr/sbin/cephadm

7
sudoers.d/cephadm
View File

@ -1,7 +0,0 @@
# allow cephadm user to sudo cephadm
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * ls
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * unit *
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * shell *
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * deploy *
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * ceph-volume *
cephadm ALL=NOPASSWD: /usr/bin/cephadm --image * rm-daemon *