debian: /var/run/ceph should be owned by ceph:ceph

Fix upstart and sysvinit scripts to create /var/run/ceph properly.

Chown existing dir on upgrade.

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

diff --git a/debian/ceph-common.postinst b/debian/ceph-common.postinst
index 647693417593b8d22c88e1dd9796c9e0a8beb091..36410a3b630b64337939c899e0f631deeaaae7ba 100644 (file)
--- a/debian/ceph-common.postinst
+++ b/debian/ceph-common.postinst
@@ -78,6 +78,13 @@ case "$1" in
            chmod u=rwx,g=rwxs,o=t /var/log/ceph
        fi
 
+       # 6. fix /var/run/ceph
+       if [ -d /var/run/ceph ]; then
+          echo -n "Fixing /var/run/ceph ownership.."
+          chown $SERVER_USER:$SERVER_GROUP /var/run/ceph
+          echo "..done"
+       fi
+
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        :

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

diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
index a392aaee6e16cac18fbe5ce7650ea6aff60984a4..5c74fc16b2e0f934ecd8a23eb8b53cbfbb76ca26 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 /var/run/ceph
+    install -d -m0755 -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 c266f6cc9f1ef10e945d347a684083c9d7091179..be4e0efad60f714e6e0d2e42d075de4824653db8 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 /var/run/ceph
+    install -d -m0755 -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 f02f46571a055a916d16542dd60f54b17ce32dff..a508b4126274c0a5e90a5cdcf336fc3f0dd08bac 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 /var/run/ceph
+    install -d -m0755 -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 fdc438006a93a7babaad7a814ab6010137160d7f..4cb6b5d08db255099dfdd21527454a478cfbef68 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 /var/run/ceph
+    install -d -m0755 -o ceph -g ceph /var/run/ceph
 end script
 
 instance ${cluster:-ceph}/$id