X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fnightly-clean-trash.sh;h=c5cdebae854ebd3eeb41dbe9e2fb310f7ec0d955;hb=6f9aada325c0c44ef0d7acd068f884b29a926a6d;hp=1b927eb87f3a35ec5dceed504fce3bc7808de140;hpb=b993dccbad34218b99ea788f074a3f176fc73af3;p=infrastructure.git

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 1b927eb..c5cdeba 100755
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -11,10 +11,18 @@ potential_vservers=$(find /build/trash -maxdepth 1 -type d -print | grep -v 'tra
 # clean the vservers first
 for vserver in $potential_vservers ; do
     vname=$(basename $vserver)
+    vname=$(basename $vname .log.txt)
     if [ -d /vservers/$vname ] ; then
-	vserver --silent delete $vname
+	vserver --silent $vname delete
 	rm -f /vservers/${vname}.log.txt
     fi
-done
+done &> /dev/null
 
 echo $todelete | xargs rm -rf
+
+daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*'  -mtime +7 -print | 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
+done
+