svn commit: r1676044 - in /directory/apacheds/trunk: installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm installers/src/test/docker/deb.test

[se...@apache.org]

Author: seelmann
Date: Sat Apr 25 17:33:24 2015
New Revision: 1676044

URL: http://svn.apache.org/r1676044
Log:
DIRSERVER-2064: Delete whole instance dir when unistall deb package

Modified:
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm
    directory/apacheds/trunk/installers/src/test/docker/deb.test

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm?rev=1676044&r1=1676043&r2=1676044&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/prerm Sat Apr 25 17:33:24 2015
@@ -32,9 +32,7 @@ for instance_dir in `find /var/lib/apach
   tarball=$parent_dir/apacheds-${version}-$instance"_"$timestamp.tgz
   echo Backing up old $instance instance data to $tarball
   tar -zcf $tarball $instance_dir
-  rm -rf $instance_dir/partitions/*
-  rm -rf $instance_dir/log/*
-  rm -rf $instance_dir/.dirservice.lock
+  rm -rf $instance_dir
 done
 
 

Modified: directory/apacheds/trunk/installers/src/test/docker/deb.test
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/src/test/docker/deb.test?rev=1676044&r1=1676043&r2=1676044&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/src/test/docker/deb.test (original)
+++ directory/apacheds/trunk/installers/src/test/docker/deb.test Sat Apr 25 17:33:24 2015
@@ -85,8 +85,13 @@ grep ".*WARN.*admin password.*security b
 # uninstall
 dpkg -P apacheds
 
+# assert the backup file was created
+test -f /var/lib/${DIRNAME}*.tgz
+tar -tf /var/lib/${DIRNAME}*.tgz >> /dev/null
+
 # assert files and directory no more exist
 test ! -e /opt/${DIRNAME}
+test ! -e /var/lib/${DIRNAME}/default
  
 # SUCCESS
 echo "SUCCESS"