From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Sep 2015 14:51:33 +0000 (-0400)
Subject: kill /etc/security/limits.d/ceph
X-Git-Tag: v9.1.0~143^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8678a8acec1c0ee123f97021358ce26cdfe06c90;p=ceph.git

kill /etc/security/limits.d/ceph

This only affects login shells; not useful.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index 2508278d31d8..7ff3cf7f1221 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ EXTRA_DIST += \
 	src/test/cli \
 	src/test/downloads \
 	systemd/ceph.tmpfiles.d \
-	etc/ceph.limits.d \
 	etc/default/ceph \
 	etc/sysconfig/ceph \
 	etc/sysconfig/SuSEfirewall2.d/services/ceph-mon \
diff --git a/ceph.spec.in b/ceph.spec.in
index a2fda78f2f16..45fc06eadc20 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -592,7 +592,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
 install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
-install -D etc/ceph.limits.d $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/ceph.conf
 install -m 0644 -D etc/sysconfig/ceph $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ceph
 %if 0%{?_with_systemd}
   install -m 0644 -D systemd/ceph.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
@@ -790,7 +789,6 @@ mkdir -p %{_localstatedir}/run/ceph/
 %{_libdir}/ceph/erasure-code/libec_*.so*
 %{_udevrulesdir}/60-ceph-partuuid-workaround.rules
 %{_udevrulesdir}/95-ceph-osd.rules
-%config %{_sysconfdir}/security/limits.d/ceph.conf
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/sysconfig/ceph
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 1fa4c1309f08..4e21adff9c47 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -25,6 +25,5 @@ usr/share/ceph/id_dsa_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com.pub
 etc/ceph/rbdmap
 etc/init.d/rbdmap
-etc/security/limits.d/ceph
 lib/udev/rules.d/50-rbd.rules
 usr/lib/python*/dist-packages/ceph_argparse.py*
diff --git a/debian/rules b/debian/rules
index 251eb42d37b6..c81036a47195 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,6 @@ install: build
 	install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
 	install -D -m 644 src/rbdmap $(DESTDIR)/etc/ceph/rbdmap
 	install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap
-	install -D -m 644 etc/ceph.limits.d $(DESTDIR)/etc/security/limits.d/ceph
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.
diff --git a/etc/ceph.limits.d b/etc/ceph.limits.d
deleted file mode 100644
index 702aa0332ecb..000000000000
--- a/etc/ceph.limits.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/security/limits.d/ceph
-#
-#<domain>        <type>  <item>  <value>
-#
-
-# We want a very large value for nofile for the ceph user as the ceph
-# clients and daemons consume lots and lots of file descriptors.
-
-ceph	  -	      nofile  4194304