Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf

diff --git a/debian/changelog b/debian/changelog
index 746a4a3e9e54d389b2c8d72147a986938f7fea53..8a744ce20ed054e3742e8b45097140db7feea102 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 cinder (2012.2-1) experimental; urgency=low
 
+  [ Mehdi Abaakouk ]
   * New upstream release 2012.2
 
+  [ Thomas Goirand ]
+  * Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf.
+
  -- Mehdi Abaakouk <sileht@sileht.net>  Sat, 29 Sep 2012 09:23:22 +0200
 
 cinder (2012.2~rc1+git1~6b31057-1) experimental; urgency=low

diff --git a/debian/cinder-common.install b/debian/cinder-common.install
index 6d744e2a7a6cbe9d3eb44083cbf0a1cdb982b297..0a443618c7c47b569bbf9ca9d304ecfc070ed1a6 100644 (file)
--- a/debian/cinder-common.install
+++ b/debian/cinder-common.install
@@ -4,6 +4,6 @@ etc/cinder/policy.json etc/cinder
 etc/cinder/api-paste.ini etc/cinder
 etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d
 etc/cinder/rootwrap.conf etc/cinder
-debian/cinder.conf etc/cinder
+debian/cinder.conf usr/share/cinder-common
 debian/logging.conf etc/cinder
 debian/cinder_sudoers etc/sudoers.d

diff --git a/debian/cinder-common.postinst b/debian/cinder-common.postinst
index b14acec5c2e5fff36477f84b59ebfc9196ae175e..5b6b51ca86f95e5e0f2d151827cae71e3587d264 100644 (file)
--- a/debian/cinder-common.postinst
+++ b/debian/cinder-common.postinst
@@ -12,10 +12,10 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 
     # Create config files if they don't exist
     if ! [ -d /etc/cinder ] ; then
-        mkdir /etc/cinder
+        mkdir -p /etc/cinder
     fi
     if ! [ -e /etc/cinder/cinder.conf ] ; then
-        cp /usr/share/doc/cinder-common/cinder.conf.dist /etc/cinder/cinder.conf
+        cp /usr/share/cinder-common/cinder.conf /etc/cinder/cinder.conf
     fi
 
     chown -R cinder:adm /var/log/cinder

diff --git a/debian/cinder-common.postrm b/debian/cinder-common.postrm
index 26e0235321ac267ed55501c02968f050ba516c18..b2335705f6b486e376144775205e00aa727d9e9a 100644 (file)
--- a/debian/cinder-common.postrm
+++ b/debian/cinder-common.postrm
@@ -23,6 +23,7 @@ fi
 
 if [ "$1" = "purge" ] ; then
     rm -f /etc/cinder/cinder.conf
+    rmdir --ignore-fail-on-non-empty /etc/cinder
     rm -f /etc/default/cinder-common
     rm -rf /var/lib/cinder
 fi