[Pkg-voip-commits] r8962 - in /mumble-django/trunk/debian: changelog mumble-django-configure mumble-django.postinst mumble-django.postrm

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue May 31 19:33:28 2011
New Revision: 8962

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8962
Log:
Incorporate dpkg-statoverride into the maintainer scripts and m-d-c in
order to allow file ownership and permissions of /usr/share/mumble-django
and /var/lib/mumble-django{,/mumble-django.db3} to be changed.
Closes: #624426

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/mumble-django-configure
    mumble-django/trunk/debian/mumble-django.postinst
    mumble-django/trunk/debian/mumble-django.postrm

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=8962&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue May 31 19:33:28 2011
@@ -1,8 +1,11 @@
 mumble-django (2.4-4) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Thu, 14 Apr 2011 00:00:42 +0200
+  * Incorporate dpkg-statoverride into the maintainer scripts and m-d-c in
+    order to allow file ownership and permissions of /usr/share/mumble-django
+    and /var/lib/mumble-django{,/mumble-django.db3} to be changed.
+    Closes: #624426
+
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Tue, 31 May 2011 21:31:11 +0200
 
 mumble-django (2.4-3) unstable; urgency=high
 

Modified: mumble-django/trunk/debian/mumble-django-configure
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django-configure?rev=8962&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django-configure (original)
+++ mumble-django/trunk/debian/mumble-django-configure Tue May 31 19:33:28 2011
@@ -17,9 +17,16 @@
 set -u
 
 MUMBLE_DJANGO_INSTDIR="/usr/share/mumble-django"
-MUMBLE_DJANGO_USER="www-data"
 MUMBLE_DJANGO_MUNIN="/etc/munin/plugins/mumble-django"
 MURMUR_CONNSTR="Meta:tcp -h 127.0.0.1 -p 6502"
+
+# Query dpkg-statoverride to find out the user MD is running as
+if dpkg-statoverride --list /var/lib/mumble-django/mumble-django.db3
+then
+	MUMBLE_DJANGO_USER=$(dpkg-statoverride --list /var/lib/mumble-django/mumble-django.db3 | cut -f1 '-d ')
+else
+	MUMBLE_DJANGO_USER="www-data"
+fi
 
 echo "Welcome to mumble-django-configure!"
 echo "-------------------------------------------"
@@ -51,7 +58,7 @@
 		./pyweb/manage.py $@
 	else
 		echo "Running as ${MUMBLE_DJANGO_USER}: manage.py $@"
-		su "${MUMBLE_DJANGO_USER}" -c "./pyweb/manage.py $@"
+		su "${MUMBLE_DJANGO_USER}" -s /bin/bash -c "./pyweb/manage.py $@"
 	fi
 }
 

Modified: mumble-django/trunk/debian/mumble-django.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postinst?rev=8962&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postinst (original)
+++ mumble-django/trunk/debian/mumble-django.postinst Tue May 31 19:33:28 2011
@@ -3,8 +3,16 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-	chown -R www-data:www-data /var/lib/mumble-django
-	chown -R www-data:www-data /usr/share/mumble-django
+	setperm(){
+		FILE="$1"
+		PERM="$2"
+		dpkg-statoverride --list /var/lib/mumble-django/mumble-django.db3 >/dev/null || \
+			dpkg-statoverride --update --add www-data www-data "$PERM" "$FILE"
+	}
+	
+	setperm "/usr/share/mumble-django" 0750
+	setperm "/var/lib/mumble-django"   0750
+	setperm "/var/lib/mumble-django/mumble-django.db3" 0640
 	
 	if [ -x /etc/init.d/apache2 ]; then
 		invoke-rc.d --quiet apache2 reload

Modified: mumble-django/trunk/debian/mumble-django.postrm
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postrm?rev=8962&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postrm (original)
+++ mumble-django/trunk/debian/mumble-django.postrm Tue May 31 19:33:28 2011
@@ -7,6 +7,12 @@
 fi
 
 if [ "$1" = "purge" ] ; then
+	for FILE in /usr/share/mumble-django /var/lib/mumble-django /var/lib/mumble-django/mumble-django.db3
+	do
+		dpkg-statoverride --list /var/lib/mumble-django/mumble-django.db3 >/dev/null && \
+			dpkg-statoverride --remove "$FILE"
+	done
+	
 	rm -rf /var/lib/mumble-django
 	# mumble-django-configure might have installed the Munin plugin.
 	rm -f /etc/munin/plugins/mumble-django