From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 7 Feb 2007 23:27:51 +0000 (+0000)
Subject: merge changes from head
X-Git-Tag: planetlab-4_0-rc1~2
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=6fdfda619c3cae3d95a19f4d7429b7c3e5eaf075

merge changes from head
---

diff --git a/plc.d/crond b/plc.d/crond
index 8ad9fdd..32995f9 100755
--- a/plc.d/crond
+++ b/plc.d/crond
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: crond,v 1.7 2007/01/18 22:10:33 mlhuang Exp $
+# $Id: crond,v 1.9 2007/02/07 23:21:27 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -44,7 +44,6 @@ EOF
 
 	if [ "$PLC_BOOT_ENABLED" = "1" ] ; then
 	    echo "*/5 * * * * root gen-slices-xml-05.py" >>/etc/cron.d/plc.cron
-	    echo "*/15 * * * * root gen-sites-xml.py" >>/etc/cron.d/plc.cron
 	    gen-slices-xml-05.py
 	    check
 	    gen-sites-xml.py
@@ -53,6 +52,7 @@ EOF
 
 	if [ "$PLC_WWW_ENABLED" = "1" ] ; then
 	    echo "*/15 * * * * root gen-static-content.py" >>/etc/cron.d/plc.cron
+	    echo "*/15 * * * * root gen-sites-xml.py" >>/etc/cron.d/plc.cron
 	    echo "00 * * * * wget -O - -q http://localhost/cron.php" >>/etc/cron.d/plc.cron
 	    gen-static-content.py
 	    check