X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getconf.py;h=155c26ff3b85bb9ca1292b55b609313f93cdcfd0;hb=d5b0651a666c9a6b2deb4103ed15c3c06075395d;hp=f40e108d4563591070df0d884ba032acf2525099;hpb=77f84f1e8242cdc45eb091ab65eef940a23493a6;p=monitor.git

diff --git a/getconf.py b/getconf.py
index f40e108..155c26f 100755
--- a/getconf.py
+++ b/getconf.py
@@ -8,31 +8,31 @@ import os
 def getconf(hostname, force=False, media=None):
 	api = plc.PLC(auth.auth, auth.plc)
 	n = api.GetNodes(hostname)
-	filename = "bootcd-alpha/" + hostname + ".txt"
+	filename = "bootcd/" + hostname + ".txt"
 	if not os.path.exists(filename) or force:
-		f = open("bootcd-alpha/" + hostname + ".txt", 'w')
+		f = open("bootcd/" + hostname + ".txt", 'w')
 		f.write( api.AdmGenerateNodeConfFile(n[0]['node_id']) )
 		f.close()
-		print os.system("cd bootcd-alpha; ./build.sh -f %s.txt -t iso -o /plc/data/var/www/html/bootcds/%s.iso &> /dev/null" % ( hostname, hostname))
-		print os.system("cd bootcd-alpha; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
+		print os.system("cd bootcd; ./build.sh -f %s.txt -t iso -o /plc/data/var/www/html/bootcds/%s.iso &> /dev/null" % ( hostname, hostname))
+		print os.system("cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
 	else:
 		# assume that the images have already been generated..
 		pass
 
 	args = {}
 	if not media:
-		args['url_list']  = "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s-partition.usb\n" % hostname
-		args['url_list'] += "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s.iso" % hostname
+		args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
+		args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
 	else:
 		if media == "usb":
-			args['url_list']  = "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s-partition.usb\n" % hostname
+			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
 		elif media == "iso":
-			args['url_list']  = "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s.iso" % hostname
+			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
 		else:
-			args['url_list']  = "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s-partition.usb\n" % hostname
-			args['url_list'] += "   http://pl-virtual-03.cs.princeton.edu/bootcds/%s.iso" % hostname
+			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
+			args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
 			
-	#print "http://pl-virtual-03.cs.princeton.edu/bootcds/%s.usb\n" % hostname
+	#print "http://monitor.planet-lab.org/bootcds/%s.usb\n" % hostname
 
 	return args