Merge lp:~zulcss/glance/glance-add-group into lp:~openstack-ubuntu-packagers/glance/diablo

[Chuck Short]

[lp:~zulcss/glance/glance-add-group]

65. By Chuck Short on 2011-09-19

Delete group as well

[Clint Byrum (clint-fewbar)]

Hi Chuck,

This late in the cycle, with beta's having already been tested, we probably need to fix any files in /var/lib/glance that are 'glance.nogroup' to be 'glance.glance' if the version is <= 2011.3~rc~20110915.r1007-0ubuntu1.

review: Needs Fixing

[lp:~zulcss/glance/glance-add-group]

66. By Chuck Short on 2011-09-21

Change group on /var/lib/glance as well

[Chuck Short (zulcss)]

Ok I have added the chown -R glance:glance /var/lib/glance /var/log/glance

[Clint Byrum (clint-fewbar)]

Wow I had overlooked the fact that we were already doing a blanket chown on every upgrade.

Is that necessary?

Anyway, that is a separate issue which we can raise as a bug somewhere else. The rest looks good. +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-19 17:04:18 +0000
+++ debian/changelog	2011-09-21 13:18:25 +0000
@@ -1,3 +1,10 @@
+glance (2011.3~rc~20110915.r1007-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/glance.postinst: Add glance group and add glance user 
+    to it. (LP: #851860) 
+
+ -- Chuck Short <[e-mail]>  Mon, 19 Sep 2011 09:36:26 -0400
+
 glance (2011.3~rc~20110915.r1007-0ubuntu1) oneiric; urgency=low
 
   [ Chuck Short ]

=== modified file 'debian/glance.postinst'
--- debian/glance.postinst	2011-08-11 11:50:38 +0000
+++ debian/glance.postinst	2011-09-21 13:18:25 +0000
@@ -4,11 +4,14 @@
 
 if [ "$1" = "configure" ]
 then
+	if ! getent group glance > /dev/null 2>&1
+		addgroup --system glance >/dev/nul
+	fi
 	if ! getent passwd glance > /dev/null 2>&1
 	then
-        adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance
+        adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/bash glance
 	fi
-	chown glance -R /var/lib/glance/ /var/log/glance/
+	chown glance:glance -R /var/lib/glance/ /var/log/glance/
 	if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
 	then
 		su -c 'glance-manage db_sync' glance

=== modified file 'debian/glance.postrm'
--- debian/glance.postrm	2011-08-24 19:55:31 +0000
+++ debian/glance.postrm	2011-09-21 13:18:25 +0000
@@ -10,6 +10,10 @@
 			deluser --system --quiet --backup-to /var/lib glance
 		fi	
 
+		if which delgroup > /dev/nul 2>&1; then
+			delgroup --system --quiet glance
+		fi
+
 		[ -e /var/lib/glance ] && rm -rf /var/lib/glance
 		[ -e /var/log/glance ] && rm -rf /var/log/glance
 		;;