X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fnightly-clean-trash.sh;h=91d332b88e7d9d2d76906fe53aa77088ee671caa;hb=073e40336f08758aa00b3c434c1c06bcbcea2527;hp=dcef77727c3758ee501f8a2af39dc7396df615b2;hpb=fe0721d5668db678246ecc51482e6ecfcfe4f94c;p=infrastructure.git

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index dcef777..91d332b 100755
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -3,6 +3,11 @@
 # -mtime +1 : older than one day
 # grep -v : preserve the top directory
 
+# this script is obsolete
+# as it is still mentioned in our build boxes crontabs we keep it alive for now
+
+exit 0
+
 exec >> /root/.nightly-clean-trash.log
 exec 2>&1
 
@@ -19,15 +24,16 @@ potential_vservers=$(find /build/trash -maxdepth 1 -type d -print 2> /dev/null |
     vname=$(basename $vname .log.txt)
     vname=$(basename $vname .timestamp)
     if [ -d /vservers/$vname ] ; then
-	vserver --silent $vname delete
+	virsh -c lxc:/// destroy $vname >$ /dev/null && echo $vname destroyed
+	virsh -c lxc:/// undefine $vname >$ /dev/null && echo $vname undefined
 	rm -f /vservers/${vname}.log.txt
 	rm -f /vservers/${vname}.timestamp
     fi
-done &> /dev/null
+done
 
 echo $todelete | xargs rm -rf
 
-daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*'  -mtime +7 -print 2> /dev/null | sed -e 's,^/vservers/,,')
+daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*'  -mtime +14 -print 2> /dev/null | sed -e 's,^/vservers/,,')
 for vname in $daily_vnames; do
    [ -f /vservers/${vname}.log.txt ] && rm  /vservers/${vname}.log.txt
    [ -d /vservers/$vname ] && vserver --silent $vname delete