Merge lp:~gandelman-a/ubuntu/precise/keystone/lp900553 into lp:~ubuntu-server-dev/keystone/essex

[Adam Gandelman]

[Adam Gandelman (gandelman-a)]

Resubmitting this to the correct packaging branch.

[Chuck Short (zulcss)]

lgtm

review: Approve

[lp:~gandelman-a/ubuntu/precise/keystone/lp900553]

48. By Chuck Short on 2011-12-06

debian/keystone.postinst: Remove redundant chgrp. Also tighten permissions
on /var/lib/keystone and /etc/keystone (LP: #900553)

[Scott Moser (smoser)]

the only comment i have is really on the previous code that was here:
If the user had set up for one of these directories to be symlinked
elsewhere, the chown will not correctly affect the target.

example:
$ mkdir /tmp/tmpx
$ touch /tmp/tmpx/foo
$ ls -l /tmp/tmpx/foo
-rw-rw-r-- 1 smoser smoser 0 Dec 6 15:16 /tmp/tmpx/foo
$ ln -snf /tmp/tmpx /tmp/tmpx.link
$ ls -l /tmp/tmpx/foo /tmp/tmpx.link
-rw-rw-r-- 1 smoser smoser 0 Dec 6 15:16 /tmp/tmpx/foo
lrwxrwxrwx 1 smoser smoser 9 Dec 6 15:17 /tmp/tmpx.link -> /tmp/tmpx
$ sudo chown -R root:root /tmp/tmpx.link
$ ls -l /tmp/tmpx/foo /tmp/tmpx.link
-rw-rw-r-- 1 smoser smoser 0 Dec 6 15:16 /tmp/tmpx/foo
lrwxrwxrwx 1 root root 9 Dec 6 15:17 /tmp/tmpx.link -> /tmp/tmpx
$ sudo chown -R root:root /tmp/tmpx.link/
$ ls -l /tmp/tmpx/foo /tmp/tmpx.link
-rw-rw-r-- 1 root root 0 Dec 6 15:16 /tmp/tmpx/foo
lrwxrwxrwx 1 root root 9 Dec 6 15:17 /tmp/tmpx.link -> /tmp/tmpx

Basically, I think you should have the trailing / on the directories.

[Adam Gandelman (gandelman-a)]

Ah, good catch. Thanks, Scott. Pushed an update containing the trailing /'s

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 14:40:38 +0000
+++ debian/changelog	2011-12-06 20:04:23 +0000
@@ -1,3 +1,10 @@
+keystone (2012.1~e2~20111202.1379-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/keystone.postinst: Remove redundant chgrp. Also tighten permissions
+    on /var/lib/keystone and /etc/keystone (LP: #900553)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 06 Dec 2011 11:44:53 -0800
+
 keystone (2012.1~e2~20111202.1379-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== modified file 'debian/keystone.postinst'
--- debian/keystone.postinst	2011-12-02 14:40:38 +0000
+++ debian/keystone.postinst	2011-12-06 20:04:23 +0000
@@ -12,9 +12,8 @@
 	then
 		addgroup --system keystone >/dev/null
 	fi
-	chown keystone:keystone -R /var/lib/keystone /var/log/keystone
-	chgrp keystone -R /var/lib/keystone /var/log/keystone
-	chmod 0700 /var/log/keystone
+	chown keystone:keystone -R /var/lib/keystone /var/log/keystone /etc/keystone
+	chmod 0700 /var/lib/keystone /var/log/keystone /etc/keystone
 
 fi