make /var/run/ceph 770 ceph:ceph

This allows members of the ceph group to make librados clients (like the
ceph cli and qemu) create sockets in the default /var/run/ceph/* location.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 4e864f3fa2fcd707f7aad2b0a2e3487d536972a4..149ed406f4d1a85a33931a3140edc6a1695efd47 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -816,7 +816,7 @@ mkdir -p %{_localstatedir}/run/ceph/
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mds
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw
-%attr(750,ceph,ceph) %dir %{_localstatedir}/run/ceph
+%attr(770,ceph,ceph) %dir %{_localstatedir}/run/ceph
 
 #################################################################################
 %files -n ceph-common

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 4255c550a434dfce73337087715e9acbaf2aa82b..faeb7bd76d6ca03e356004386d2c87bc1a891d11 100755 (executable)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -381,7 +381,7 @@ for name in $what; do
            echo Starting Ceph $name on $host...
            if [ ! -d $run_dir ]; then
                # assume /var/run exists
-               install -d -m0755 -o ceph -g ceph /var/run/ceph
+               install -d -m0770 -o ceph -g ceph /var/run/ceph
            fi
            get_conf pre_start_eval "" "pre start eval"
            [ -n "$pre_start_eval" ] && $pre_start_eval

diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
index 5c74fc16b2e0f934ecd8a23eb8b53cbfbb76ca26..7c691173927c09be867692706257aee059b982e6 100644 (file)
--- a/src/upstart/ceph-mds.conf
+++ b/src/upstart/ceph-mds.conf
@@ -13,7 +13,7 @@ pre-start script
     test -x /usr/bin/ceph-mds || { stop; exit 0; }
     test -d "/var/lib/ceph/mds/${cluster:-ceph}-$id" || { stop; exit 0; }
 
-    install -d -m0755 -o ceph -g ceph /var/run/ceph
+    install -d -m0770 -o ceph -g ceph /var/run/ceph
 end script
 
 instance ${cluster:-ceph}/$id

diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
index be4e0efad60f714e6e0d2e42d075de4824653db8..89119457b9c2863077803e01abd452cf54b9b3d3 100644 (file)
--- a/src/upstart/ceph-mon.conf
+++ b/src/upstart/ceph-mon.conf
@@ -13,7 +13,7 @@ pre-start script
     test -x /usr/bin/ceph-mon || { stop; exit 0; }
     test -d "/var/lib/ceph/mon/${cluster:-ceph}-$id" || { stop; exit 0; }
 
-    install -d -m0755 -o ceph -g ceph /var/run/ceph
+    install -d -m0770 -o ceph -g ceph /var/run/ceph
 end script
 
 instance ${cluster:-ceph}/$id

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index a508b4126274c0a5e90a5cdcf336fc3f0dd08bac..02ca2389a17b5b2e56861cf261e1aae9d07c74bd 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -13,7 +13,7 @@ pre-start script
     test -x /usr/bin/ceph-osd || { stop; exit 0; }
     test -d "/var/lib/ceph/osd/${cluster:-ceph}-$id" || { stop; exit 0; }
 
-    install -d -m0755 -o ceph -g ceph /var/run/ceph
+    install -d -m0770 -o ceph -g ceph /var/run/ceph
 
     /usr/libexec/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id"
 end script

diff --git a/src/upstart/radosgw.conf b/src/upstart/radosgw.conf
index 4cb6b5d08db255099dfdd21527454a478cfbef68..828c314d2386d9bf60eaf2b7fe5579c73aae62b5 100644 (file)
--- a/src/upstart/radosgw.conf
+++ b/src/upstart/radosgw.conf
@@ -13,7 +13,7 @@ pre-start script
     test -x /usr/bin/radosgw || { stop; exit 0; }
     test -d "/var/lib/ceph/radosgw/${cluster:-ceph}-$id" || { stop; exit 0; }
 
-    install -d -m0755 -o ceph -g ceph /var/run/ceph
+    install -d -m0770 -o ceph -g ceph /var/run/ceph
 end script
 
 instance ${cluster:-ceph}/$id

diff --git a/systemd/ceph.tmpfiles.d b/systemd/ceph.tmpfiles.d
index d2a7aa1b5136b21e20f0864ce7459647ba20c2fc..f068e268a133a23942166d599a84635773503f65 100644 (file)
--- a/systemd/ceph.tmpfiles.d
+++ b/systemd/ceph.tmpfiles.d
@@ -1 +1 @@
-d /var/run/ceph 0755 ceph ceph -
+d /var/run/ceph 0770 ceph ceph -