[or-cvs] r13207: postinst: We were only fixing the permissions of /var/{lib,r (tor/trunk/debian)

[weasel@xxxxxxxx]

Author: weasel
Date: 2008-01-21 09:58:20 -0500 (Mon, 21 Jan 2008)
New Revision: 13207

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/tor.postinst
Log:
postinst: We were only fixing the permissions of /var/{lib,run,log}/tor when we
were not upgrading.  Unfortunately the check doesn't work all that well usually
in cases where the package was removed (not purged) and then later re-installed
again.  Now we ensure proper ownership and modes for all the directories and
files below /var/{lib,run,log}/tor (the dirs themselves included) every time we
run postinst.


Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-01-21 14:46:49 UTC (rev 13206)
+++ tor/trunk/debian/changelog	2008-01-21 14:58:20 UTC (rev 13207)
@@ -6,8 +6,14 @@
     to some other range then they probably have a good reason for that.
   * postinst: change wording if debian-tor's homedir is wrong, do not
     print anything if it is ok.
+  * postinst: We were only fixing the permissions of /var/{lib,run,log}/tor
+    when we were not upgrading.  Unfortunately the check doesn't work all
+    that well usually in cases where the package was removed (not purged)
+    and then later re-installed again.  Now we ensure proper ownership
+    and modes for all the directories and files below /var/{lib,run,log}/tor
+    (the dirs themselves included) every time we run postinst.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Mon, 21 Jan 2008 15:46:29 +0100
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Mon, 21 Jan 2008 15:56:12 +0100
 
 tor (0.2.0.17-alpha-1) experimental; urgency=low
 

Modified: tor/trunk/debian/tor.postinst
===================================================================
--- tor/trunk/debian/tor.postinst	2008-01-21 14:46:49 UTC (rev 13206)
+++ tor/trunk/debian/tor.postinst	2008-01-21 14:58:20 UTC (rev 13207)
@@ -30,29 +30,19 @@
 		debian-tor
 fi
 
-# ch{owning,moding} things around
-# We will do nothing across upgrades.
 
-if [ "$2" = "" ]; then
-    for i in lib log run; do
-	chown -R debian-tor:debian-tor /var/$i/tor
-	chmod -R 700 /var/$i/tor
-	find /var/$i/tor -type f -exec chmod 600 '{}' ';'
-    done
-    chgrp -R adm  /var/log/tor
-    chmod -R g+rX /var/log/tor
-    chmod    g+s  /var/log/tor
-else
-    # fix permissions of logs after 0.0.8+0.0.9pre5-1
-    if [ "$1" = "configure" ]; then
-        if dpkg --compare-versions "$2" le "0.0.8+0.0.9pre5-1" ; then
-            chgrp -R adm  /var/log/tor
-            chmod -R g+rX /var/log/tor
-            chmod    g+s  /var/log/tor
-        fi
-    fi
-fi
+find /var/lib/tor ! -user debian-tor -o ! -group debian-tor -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor
+find /var/lib/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02700
+find /var/lib/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600
 
+find /var/run/tor ! -user debian-tor -o ! -group debian-tor -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor
+find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750
+find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600
+
+find /var/log/tor ! -user debian-tor -o ! -group adm -print0 | xargs -0 --no-run-if-empty chown debian-tor:adm
+find /var/log/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750
+find /var/log/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00640
+
 #DEBHELPER#
 
 exit 0