f37 -> f39

[infrastructure.git] / scripts / nightly-clean-trash.sh

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 014806b..91d332b 100755 (executable)
--- 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
 
@@ -17,15 +22,18 @@ potential_vservers=$(find /build/trash -maxdepth 1 -type d -print 2> /dev/null |
 [ -d /vservers ] && for vserver in $potential_vservers ; do
     vname=$(basename $vserver)
     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