r179 - in /debtorrent/trunk/debian: debtorrent-client.init debtorrent.postinst dirs postrm rules

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Mon Jul 16 23:29:13 2007
New Revision: 179

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=179
Log:
Remove cache and user on purge.

Modified:
    debtorrent/trunk/debian/debtorrent-client.init
    debtorrent/trunk/debian/debtorrent.postinst
    debtorrent/trunk/debian/dirs
    debtorrent/trunk/debian/postrm
    debtorrent/trunk/debian/rules

Modified: debtorrent/trunk/debian/debtorrent-client.init
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.init?rev=179&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.init (original)
+++ debtorrent/trunk/debian/debtorrent-client.init Mon Jul 16 23:29:13 2007
@@ -20,7 +20,7 @@
 DAEMON=/usr/bin/debtorrent-client
 NAME="debtorrent-client"
 DEFAULTSFILE=/etc/default/debtorrent-client
-PIDFILE=/var/run/debtorent-client.pid
+PIDFILE=/var/run/debtorrent-client.pid
 
 DEBTORRENT_ENABLE=false
 DEBTORRENT_USER=debtorrent

Modified: debtorrent/trunk/debian/debtorrent.postinst
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent.postinst?rev=179&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent.postinst (original)
+++ debtorrent/trunk/debian/debtorrent.postinst Mon Jul 16 23:29:13 2007
@@ -30,6 +30,12 @@
 					--home /var/cache/debtorrent --disabled-password \
 					--disabled-login --shell /bin/false --group debtorrent
 		fi
+		
+		mkdir -p /var/cache/debtorrent
+		chown -R root:debtorrent /var/log/debtorrent
+		chown -R root:debtorrent /var/cache/debtorrent
+		chmod -R 775 /var/log/debtorrent
+		chmod -R 775 /var/cache/debtorrent
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: debtorrent/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/dirs?rev=179&op=diff
==============================================================================
--- debtorrent/trunk/debian/dirs (original)
+++ debtorrent/trunk/debian/dirs Mon Jul 16 23:29:13 2007
@@ -4,4 +4,3 @@
 etc/init.d
 etc/default
 var/log/debtorrent
-var/cache/debtorrent

Modified: debtorrent/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/postrm?rev=179&op=diff
==============================================================================
--- debtorrent/trunk/debian/postrm (original)
+++ debtorrent/trunk/debian/postrm Mon Jul 16 23:29:13 2007
@@ -17,6 +17,20 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+if test "$1" = "purge"; then
+  # Don't remove the logs
+  #rm -rf /var/log/debtorrent
+  # Instead convert to root
+  chown -R root:adm /var/log/debtorrent
+  chmod -R 755 /var/log/debtorrent
+  
+  echo Purging debtorrent cache directory
+  rm -rf /var/cache/debtorrent
+
+  if id debtorrent >/dev/null; then
+    deluser debtorrent
+  fi
+fi
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

Modified: debtorrent/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/rules?rev=179&op=diff
==============================================================================
--- debtorrent/trunk/debian/rules (original)
+++ debtorrent/trunk/debian/rules Mon Jul 16 23:29:13 2007
@@ -50,7 +50,6 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installman
-	dh_installinit --name=debtorrent-client
 	
 	# Remove the .py from the end of each of these and move them out of
 	# the path
@@ -68,6 +67,7 @@
 	dh_compress
 	dh_fixperms
 	dh_pysupport
+	dh_installinit --name=debtorrent-client
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol