debian: make ceph-common own etc/ceph, var/log/ceph

Clients can make use of these directories, and ceph-common is required by
ceph, so nothing should break here.

Change the purge postrm script to be for ceph-common (it does nothing else).

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

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
new file mode 100644 (file)
index 0000000..4987b42
--- /dev/null
+++ b/debian/ceph-common.dirs
@@ -0,0 +1,2 @@
+etc/ceph
+var/log/ceph

diff --git a/debian/ceph-common.postrm b/debian/ceph-common.postrm
new file mode 100644 (file)
index 0000000..b621854
--- /dev/null
+++ b/debian/ceph-common.postrm
@@ -0,0 +1,47 @@
+#!/bin/sh
+# postrm script for ceph-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+    ;;
+
+    purge)
+       rm -rf /var/log/ceph 
+       rm -rf /etc/ceph
+    ;;
+
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index ca7a880636cc4344d70b1d02ea923cd3a5c9dc4f..21b6c23ca036400e2aa26d80a06a0373f6a716f5 100644 (file)
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,5 +1,3 @@
-etc/ceph
-var/log/ceph
 var/lib/ceph/tmp
 var/lib/ceph/mon
 var/lib/ceph/osd

diff --git a/debian/ceph.postrm b/debian/ceph.postrm
deleted file mode 100644 (file)
index 48e4853..0000000
--- a/debian/ceph.postrm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# postrm script for ceph
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove)
-    ;;
-
-    purge)
-       rm -rf /var/log/ceph 
-       rm -rf /etc/ceph
-    ;;
-
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-