diff options
| author | Sage Weil <sage@redhat.com> | 2018-07-06 20:43:15 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2018-07-06 20:43:15 +0200 |
| commit | 884a0d24ab7dcda7f6de0fca97f912137a4f97ed (patch) | |
| tree | 77038e47d8a6d55640a5d6c23083f2c9577fabc6 /debian | |
| parent | Merge PR #22858 into master (diff) | |
| parent | debian/control: require sudo (diff) | |
| download | ceph-884a0d24ab7dcda7f6de0fca97f912137a4f97ed.tar.xz ceph-884a0d24ab7dcda7f6de0fca97f912137a4f97ed.zip | |
Merge PR #22745 into master
* refs/pull/22745/head:
debian/control: require sudo
ceph.spec: require sudo
ceph.spec: install etc/sudoers.d/ceph-osd-smartctl
debian: install etc/sudoers.d/ceph-osd-smartctl
sudoers.d/ceph-osd-smartctl: allow user ceph to run smartctl as root
Reviewed-by: Erwan Velu <erwan@redhat.com>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/ceph-osd.install | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index 39fc29bd59d..39420ca413a 100644 --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -19,3 +19,4 @@ usr/share/man/man8/ceph-volume-systemd.8 usr/share/man/man8/ceph-osd.8 usr/share/man/man8/ceph-bluestore-tool.8 etc/sysctl.d/30-ceph-osd.conf +etc/sudoers.d/ceph-osd-smartctl diff --git a/debian/control b/debian/control index 783f2a95e25..708f64556e2 100644 --- a/debian/control +++ b/debian/control @@ -245,6 +245,7 @@ Package: ceph-osd Architecture: linux-any Depends: ceph-base (= ${binary:Version}), lvm2, + sudo, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, diff --git a/debian/rules b/debian/rules index c5279c8267f..f1e3930a746 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ override_dh_auto_install: install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules 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 # doc/changelog is a directory, which confuses dh_installchangelogs override_dh_installchangelogs: |