X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fnightly-clean-trash.sh;h=c5cdebae854ebd3eeb41dbe9e2fb310f7ec0d955;hb=307884166703f47264da3e682954fcaae15a47a8;hp=051f82a89a911cf8b6cd28013aa18e208867fec4;hpb=5fbe344ac270ad3791b8463a5c9bce1ebf7257d2;p=infrastructure.git

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 051f82a..c5cdeba 100755
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -11,6 +11,7 @@ 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 $vname delete
 	rm -f /vservers/${vname}.log.txt
@@ -18,3 +19,10 @@ for vserver in $potential_vservers ; do
 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
+