clean more

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 051f82a..37e7e32 100755 (executable)
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -5,12 +5,13 @@
 
 [[ -n "$@" ]] && [ "$1" = "-n" ] && set -x
 
-todelete=$(find /build/trash -maxdepth 1 -mtime +1 -print | grep -v 'trash/*$')
+todelete=$(find /build/trash -maxdepth 0 -mtime +1 -print | grep -v 'trash/*$')
 potential_vservers=$(find /build/trash -maxdepth 1 -type d -print | grep -v 'trash/*$')
 
 # 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 /vserver/$vname ] && vserver --silent $vname delete
+done
+