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

merge changes from head
---

diff --git a/plc.d/crond b/plc.d/crond
index 32995f9..3c9ea50 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.9 2007/02/07 23:21:27 mlhuang Exp $
+# $Id: crond,v 1.10 2007/02/07 23:54:35 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -46,8 +46,6 @@ EOF
 	    echo "*/5 * * * * root gen-slices-xml-05.py" >>/etc/cron.d/plc.cron
 	    gen-slices-xml-05.py
 	    check
-	    gen-sites-xml.py
-	    check
 	fi
 
 	if [ "$PLC_WWW_ENABLED" = "1" ] ; then
@@ -56,6 +54,10 @@ EOF
 	    echo "00 * * * * wget -O - -q http://localhost/cron.php" >>/etc/cron.d/plc.cron
 	    gen-static-content.py
 	    check
+	    gen-sites-xml.py
+	    check
+	    wget -O - -q http://localhost/cron.php
+	    check
 	fi
 
 	if [ "$PLC_DNS_ENABLED" = "1" ] ; then